diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-07-16 22:23:48 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-07-16 22:23:48 -0400 |
| commit | 8f92a49dfde5e8690525da028844cb7c1188d397 (patch) | |
| tree | 6974ac66da2a301b8a845bb9008de02ecc4ed39e /cmake | |
| parent | c0b4121ff2d31b2ef37e480eec18f0bd063d7a2d (diff) | |
| download | zig-8f92a49dfde5e8690525da028844cb7c1188d397.tar.gz zig-8f92a49dfde5e8690525da028844cb7c1188d397.zip | |
update to llvm9 trunk
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findclang.cmake | 16 | ||||
| -rw-r--r-- | cmake/Findlld.cmake | 14 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 18 |
3 files changed, 24 insertions, 24 deletions
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index 5555485d89..704eba9814 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -38,10 +38,10 @@ if(MSVC) else() find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h PATHS - /usr/lib/llvm/8/include - /usr/lib/llvm-8/include - /usr/lib/llvm-8.0/include - /usr/local/llvm80/include + /usr/lib/llvm/9/include + /usr/lib/llvm-9/include + /usr/lib/llvm-9.0/include + /usr/local/llvm90/include /mingw64/include) macro(FIND_AND_ADD_CLANG_LIB _libname_) @@ -49,10 +49,10 @@ else() find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} PATHS ${CLANG_LIBDIRS} - /usr/lib/llvm/8/lib - /usr/lib/llvm-8/lib - /usr/lib/llvm-8.0/lib - /usr/local/llvm80/lib + /usr/lib/llvm/9/lib + /usr/lib/llvm-9/lib + /usr/lib/llvm-9.0/lib + /usr/local/llvm90/lib /mingw64/lib /c/msys64/mingw64/lib c:\\msys64\\mingw64\\lib) diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index 1895612eb9..878a750159 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -8,14 +8,14 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h PATHS - /usr/lib/llvm-8.0/include - /usr/local/llvm80/include + /usr/lib/llvm-9.0/include + /usr/local/llvm90/include /mingw64/include) -find_library(LLD_LIBRARY NAMES lld-8.0 lld80 lld +find_library(LLD_LIBRARY NAMES lld-9.0 lld90 lld PATHS - /usr/lib/llvm-8.0/lib - /usr/local/llvm80/lib + /usr/lib/llvm-9.0/lib + /usr/local/llvm90/lib ) if(EXISTS ${LLD_LIBRARY}) set(LLD_LIBRARIES ${LLD_LIBRARY}) @@ -24,8 +24,8 @@ else() string(TOUPPER ${_libname_} _prettylibname_) find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} PATHS - /usr/lib/llvm-8.0/lib - /usr/local/llvm80/lib + /usr/lib/llvm-9.0/lib + /usr/local/llvm90/lib /mingw64/lib /c/msys64/mingw64/lib c:/msys64/mingw64/lib) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 3eb6bd9003..8a75f59a7c 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -8,12 +8,12 @@ # LLVM_LIBDIRS find_program(LLVM_CONFIG_EXE - NAMES llvm-config-8 llvm-config-8.0 llvm-config80 llvm-config + NAMES llvm-config-9 llvm-config-9.0 llvm-config90 llvm-config PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-8.0.0/bin") + "C:/Libraries/llvm-9.0.0/bin") if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") message(FATAL_ERROR "unable to find llvm-config") @@ -28,14 +28,14 @@ execute_process( OUTPUT_VARIABLE LLVM_CONFIG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -if("${LLVM_CONFIG_VERSION}" VERSION_LESS 8) - message(FATAL_ERROR "expected LLVM 8.x but found ${LLVM_CONFIG_VERSION}") +if("${LLVM_CONFIG_VERSION}" VERSION_LESS 9) + message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}") endif() -if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 9) - message(FATAL_ERROR "expected LLVM 8.x but found ${LLVM_CONFIG_VERSION}") +if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 10) + message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}") endif() -if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 9) - message(FATAL_ERROR "expected LLVM 8.x but found ${LLVM_CONFIG_VERSION}") +if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 10) + message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}") endif() execute_process( @@ -112,7 +112,7 @@ execute_process( set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) if(NOT LLVM_LIBRARIES) - find_library(LLVM_LIBRARIES NAMES LLVM LLVM-8 LLVM-8.0) + find_library(LLVM_LIBRARIES NAMES LLVM LLVM-9 LLVM-9.0) endif() link_directories("${CMAKE_PREFIX_PATH}/lib") |