Commit 234030c37a

Andrew Kelley <superjoe30@gmail.com>
2017-08-08 22:41:06
update build to look for llvm 5.0
master
1 parent 8f57544
Changed files (4)
cmake
Findclang.cmake
Findlld.cmake
Findllvm.cmake
README.md
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)
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)
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
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