diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-11-19 17:24:41 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-11-19 17:24:41 -0500 |
| commit | 9493738e5448ca166344a2d57abc44b29bb00081 (patch) | |
| tree | 9721b3e694e45f17ba21c0884759fba31fe0e1de /cmake | |
| parent | 703c6684d103f14193411b589eaa0e0b1e1189f0 (diff) | |
| parent | f3bc1c38bfb35cd588048f248c69100eaf709a4f (diff) | |
| download | zig-9493738e5448ca166344a2d57abc44b29bb00081.tar.gz zig-9493738e5448ca166344a2d57abc44b29bb00081.zip | |
Merge branch 'freebsd-up' of https://github.com/myfreeweb/zig into freebsd2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findclang.cmake | 2 | ||||
| -rw-r--r-- | cmake/Findlld.cmake | 7 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index ea1bc91d7b..9268f19730 100644 --- 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 index 1c4e9163a3..4e5b0c9a19 100644 --- 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 index 150f2a2528..b847813682 100644 --- 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" |