zig

commit 24e54799fddf7c88e0feebeeef6ac2cc2f6543a0 (tree)
parent db3b768eabaf0ca7f83cccabfaa61eb0aa400c41
Author: Greg V <greg@unrelenting.technology>
Date:   Wed, 17 Oct 2018 16:24:12 +0300

Fix CMake finding LLVM/clang/lld on FreeBSD

Diffstat:
M
cmake/Findclang.cmake
 | 
2
++
M
cmake/Findlld.cmake
 | 
7
++++++-
M
cmake/Findllvm.cmake
 | 
2
+-

3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake
@@ -30,6 +30,7 @@ else()
           /usr/lib/llvm/7/include
           /usr/lib/llvm-7/include
           /usr/lib/llvm-7.0/include
+          /usr/local/llvm70/include
           /mingw64/include)
 
       macro(FIND_AND_ADD_CLANG_LIB _libname_)
@@ -40,6 +41,7 @@ else()
               /usr/lib/llvm/7/lib
               /usr/lib/llvm-7/lib
               /usr/lib/llvm-7.0/lib
+              /usr/local/llvm70/lib
               /mingw64/lib
               /c/msys64/mingw64/lib
               c:\\msys64\\mingw64\\lib)
diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake
@@ -9,9 +9,13 @@
 find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
     PATHS
         /usr/lib/llvm-6.0/include
+        /usr/local/llvm60/include
         /mingw64/include)
 
-find_library(LLD_LIBRARY NAMES lld-6.0 lld PATHS /usr/lib/llvm-6.0/lib)
+find_library(LLD_LIBRARY NAMES lld-6.0 lld60 lld
+    PATHS
+        /usr/lib/llvm-6.0/lib
+        /usr/local/llvm70/lib)
 if(EXISTS ${LLD_LIBRARY})
     set(LLD_LIBRARIES ${LLD_LIBRARY})
 else()
@@ -20,6 +24,7 @@ else()
         find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
             PATHS
                 /usr/lib/llvm-6.0/lib
+                /usr/local/llvm70/lib
                 /mingw64/lib
                 /c/msys64/mingw64/lib
                 c:/msys64/mingw64/lib)
diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
@@ -8,7 +8,7 @@
 # LLVM_LIBDIRS
 
 find_program(LLVM_CONFIG_EXE
-    NAMES llvm-config-7 llvm-config-7.0 llvm-config
+    NAMES llvm-config-7 llvm-config-7.0 llvm-config70 llvm-config
     PATHS
         "/mingw64/bin"
         "/c/msys64/mingw64/bin"