diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-10-23 21:43:18 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-11-02 21:54:24 -0400 |
| commit | 94ec2190f8d8c41d19b668511bf31fae32bcd095 (patch) | |
| tree | c5ab9b20fbaf8f017661f9a159082d1ecaf9f943 /cmake | |
| parent | abff1b688420eb30d98145d8bc48e7d08f259885 (diff) | |
| download | zig-94ec2190f8d8c41d19b668511bf31fae32bcd095.tar.gz zig-94ec2190f8d8c41d19b668511bf31fae32bcd095.zip | |
update to llvm master
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findclang.cmake | 8 | ||||
| -rw-r--r-- | cmake/Findlld.cmake | 11 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 6 |
3 files changed, 13 insertions, 12 deletions
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index 4c4a13e6ce..26617d36fc 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -26,16 +26,16 @@ if(MSVC) else() find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h PATHS - /usr/lib/llvm/5/include - /usr/lib/llvm-5.0/include + /usr/lib/llvm/6/include + /usr/lib/llvm-6.0/include /mingw64/include) macro(FIND_AND_ADD_CLANG_LIB _libname_) string(TOUPPER ${_libname_} _prettylibname_) find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} PATHS - /usr/lib/llvm/5/lib - /usr/lib/llvm-5.0/lib + /usr/lib/llvm/6/lib + /usr/lib/llvm-6.0/lib /mingw64/lib /c/msys64/mingw64/lib c:\\msys64\\mingw64\\lib) diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index 911bb876b9..d3c9011205 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -6,12 +6,12 @@ # LLD_INCLUDE_DIRS # LLD_LIBRARIES -find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h +find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h PATHS - /usr/lib/llvm-5.0/include + /usr/lib/llvm-6.0/include /mingw64/include) -find_library(LLD_LIBRARY NAMES lld-5.0 lld PATHS /usr/lib/llvm-5.0/lib) +find_library(LLD_LIBRARY NAMES lld-6.0 lld PATHS /usr/lib/llvm-6.0/lib) if(EXISTS ${LLD_LIBRARY}) set(LLD_LIBRARIES ${LLD_LIBRARY}) else() @@ -19,7 +19,7 @@ else() string(TOUPPER ${_libname_} _prettylibname_) find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} PATHS - /usr/lib/llvm-5.0/lib + /usr/lib/llvm-6.0/lib /mingw64/lib /c/msys64/mingw64/lib c:/msys64/mingw64/lib) @@ -29,13 +29,14 @@ else() endmacro(FIND_AND_ADD_LLD_LIB) FIND_AND_ADD_LLD_LIB(lldDriver) + FIND_AND_ADD_LLD_LIB(lldMinGW) FIND_AND_ADD_LLD_LIB(lldELF) FIND_AND_ADD_LLD_LIB(lldCOFF) FIND_AND_ADD_LLD_LIB(lldMachO) FIND_AND_ADD_LLD_LIB(lldReaderWriter) FIND_AND_ADD_LLD_LIB(lldCore) FIND_AND_ADD_LLD_LIB(lldYAML) - FIND_AND_ADD_LLD_LIB(lldConfig) + FIND_AND_ADD_LLD_LIB(lldCommon) endif() include(FindPackageHandleStandardArgs) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 87e80f24bc..d0a4a3cba8 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -8,12 +8,12 @@ # LLVM_LIBDIRS find_program(LLVM_CONFIG_EXE - NAMES llvm-config-5.0 llvm-config + NAMES llvm-config-6.0 llvm-config PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-5.0.0/bin") + "C:/Libraries/llvm-6.0.0/bin") if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug")) execute_process( @@ -62,7 +62,7 @@ execute_process( set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) if(NOT LLVM_LIBRARIES) - find_library(LLVM_LIBRARIES NAMES LLVM LLVM-5.0 LLVM-5) + find_library(LLVM_LIBRARIES NAMES LLVM LLVM-6.0 LLVM-6) endif() link_directories("${CMAKE_PREFIX_PATH}/lib") |