Use clang+llvm-6.0.0-amd64-unknown-freebsd-10.tar.xz

before 6.0.0 it was named freebsd10
This commit is contained in:
Fangrui Song 2018-03-17 23:41:04 -07:00
parent 11293722cc
commit d7e0722ca6
3 changed files with 8 additions and 11 deletions

View File

@ -9,10 +9,10 @@ endif()
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to '${DEFAULT_CMAKE_BUILD_TYPE}' as none \ message(STATUS "Setting build type to '${DEFAULT_CMAKE_BUILD_TYPE}' as none \
was specified.") was specified.")
set(CMAKE_BUILD_TYPE ${DEFAULT_CMAKE_BUILD_TYPE} set(CMAKE_BUILD_TYPE ${DEFAULT_CMAKE_BUILD_TYPE}
CACHE STRING "Choose the type of build." FORCE) CACHE STRING "Choose the type of build." FORCE)
# Set the possible values of build type for cmake-gui # Set the possible values of build type for cmake-gui
set_property(CACHE CMAKE_BUILD_TYPE set_property(CACHE CMAKE_BUILD_TYPE
PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo) PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo)
endif() endif()

View File

@ -26,7 +26,8 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
elseif(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD) elseif(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
set(CLANG_ARCHIVE_NAME clang+llvm-${CLANG_VERSION}-amd64-unknown-freebsd10) # 6.0.0 uses freebsd-10 while 5.0.1 uses freebsd10
set(CLANG_ARCHIVE_NAME clang+llvm-${CLANG_VERSION}-amd64-unknown-freebsd-10)
endif() endif()
@ -99,9 +100,5 @@ endif()
# CMake functions have no return values so we just lift our return variable to # CMake functions have no return values so we just lift our return variable to
# the parent scope # the parent scope
set(DOWNLOADED_CLANG_DIR ${CLANG_ARCHIVE_EXTRACT_DIR} PARENT_SCOPE) set(DOWNLOADED_CLANG_DIR ${CLANG_ARCHIVE_EXTRACT_DIR} PARENT_SCOPE)
endfunction() endfunction()

View File

@ -25,7 +25,7 @@ CLANG_TARBALL_EXT = '.tar.xz'
if sys.platform == 'darwin': if sys.platform == 'darwin':
CLANG_TARBALL_NAME = 'clang+llvm-$version-x86_64-apple-darwin' CLANG_TARBALL_NAME = 'clang+llvm-$version-x86_64-apple-darwin'
elif sys.platform.startswith('freebsd'): elif sys.platform.startswith('freebsd'):
CLANG_TARBALL_NAME = 'clang+llvm-$version-amd64-unknown-freebsd10' CLANG_TARBALL_NAME = 'clang+llvm-$version-amd64-unknown-freebsd-10'
# It is either 'linux2' or 'linux3' before Python 3.3 # It is either 'linux2' or 'linux3' before Python 3.3
elif sys.platform.startswith('linux'): elif sys.platform.startswith('linux'):
# These executable depend on libtinfo.so.5 # These executable depend on libtinfo.so.5