diff --git a/README.md b/README.md index da8854e9c0..036cac1ee8 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ the Zig compiler itself: These libraries must be installed on your system, with the development files available. The Zig compiler links against them. - * LLVM, Clang, and LLD libraries == 4.x + * LLVM, Clang, and LLD libraries == 5.x ### Debug / Development Build diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index 77c2b5bb12..5acd8de060 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -8,14 +8,14 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h PATHS - /usr/lib/llvm-4.0/include + /usr/lib/llvm-5.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-4.0/lib + /usr/lib/llvm-5.0/lib /mingw64/lib /c/msys64/mingw64/lib c:\\msys64\\mingw64\\lib) diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index d20ffed6f2..911bb876b9 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -8,10 +8,10 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h PATHS - /usr/lib/llvm-4.0/include + /usr/lib/llvm-5.0/include /mingw64/include) -find_library(LLD_LIBRARY NAMES lld-4.0 lld PATHS /usr/lib/llvm-4.0/lib) +find_library(LLD_LIBRARY NAMES lld-5.0 lld PATHS /usr/lib/llvm-5.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-4.0/lib + /usr/lib/llvm-5.0/lib /mingw64/lib /c/msys64/mingw64/lib c:/msys64/mingw64/lib) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 29dd0fda1a..4708576e9e 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -8,12 +8,12 @@ # LLVM_LIBDIRS find_program(LLVM_CONFIG_EXE - NAMES llvm-config llvm-config-4.0 + NAMES llvm-config llvm-config-5.0 PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-4.0.0/bin") + "C:/Libraries/llvm-5.0.0/bin") execute_process( COMMAND ${LLVM_CONFIG_EXE} --libs