| author |  Greg V <greg@unrelenting.technology> 2018-10-17 16:24:12+03:00 |
| committer | Greg V <greg@unrelenting.technology> 2018-10-20 15:15:01+03:00 |
| log | 24e54799fddf7c88e0feebeeef6ac2cc2f6543a0 |
| tree | 2c05e3fafac561d0e66f1abbb39f041c71cfe172 |
| parent | db3b768eabaf0ca7f83cccabfaa61eb0aa400c41 |
Fix CMake finding LLVM/clang/lld on FreeBSD
3 files changed, 9 insertions(+), 2 deletions(-)
cmake/Findclang.cmake+2
| ... | @@ -30,6 +30,7 @@ else() | ... | @@ -30,6 +30,7 @@ else() |
| 30 | /usr/lib/llvm/7/include | 30 | /usr/lib/llvm/7/include |
| 31 | /usr/lib/llvm-7/include | 31 | /usr/lib/llvm-7/include |
| 32 | /usr/lib/llvm-7.0/include | 32 | /usr/lib/llvm-7.0/include |
| 33 | /usr/local/llvm70/include | ||
| 33 | /mingw64/include) | 34 | /mingw64/include) |
| 34 | 35 | ||
| 35 | macro(FIND_AND_ADD_CLANG_LIB _libname_) | 36 | macro(FIND_AND_ADD_CLANG_LIB _libname_) |
| ... | @@ -40,6 +41,7 @@ else() | ... | @@ -40,6 +41,7 @@ else() |
| 40 | /usr/lib/llvm/7/lib | 41 | /usr/lib/llvm/7/lib |
| 41 | /usr/lib/llvm-7/lib | 42 | /usr/lib/llvm-7/lib |
| 42 | /usr/lib/llvm-7.0/lib | 43 | /usr/lib/llvm-7.0/lib |
| 44 | /usr/local/llvm70/lib | ||
| 43 | /mingw64/lib | 45 | /mingw64/lib |
| 44 | /c/msys64/mingw64/lib | 46 | /c/msys64/mingw64/lib |
| 45 | c:\\msys64\\mingw64\\lib) | 47 | c:\\msys64\\mingw64\\lib) |
cmake/Findlld.cmake+6-1
| ... | @@ -9,9 +9,13 @@ | ... | @@ -9,9 +9,13 @@ |
| 9 | find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h | 9 | find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h |
| 10 | PATHS | 10 | PATHS |
| 11 | /usr/lib/llvm-6.0/include | 11 | /usr/lib/llvm-6.0/include |
| 12 | /usr/local/llvm60/include | ||
| 12 | /mingw64/include) | 13 | /mingw64/include) |
| 13 | 14 | ||
| 14 | find_library(LLD_LIBRARY NAMES lld-6.0 lld PATHS /usr/lib/llvm-6.0/lib) | 15 | find_library(LLD_LIBRARY NAMES lld-6.0 lld60 lld |
| 16 | PATHS | ||
| 17 | /usr/lib/llvm-6.0/lib | ||
| 18 | /usr/local/llvm70/lib) | ||
| 15 | if(EXISTS ${LLD_LIBRARY}) | 19 | if(EXISTS ${LLD_LIBRARY}) |
| 16 | set(LLD_LIBRARIES ${LLD_LIBRARY}) | 20 | set(LLD_LIBRARIES ${LLD_LIBRARY}) |
| 17 | else() | 21 | else() |
| ... | @@ -20,6 +24,7 @@ else() | ... | @@ -20,6 +24,7 @@ else() |
| 20 | find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} | 24 | find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} |
| 21 | PATHS | 25 | PATHS |
| 22 | /usr/lib/llvm-6.0/lib | 26 | /usr/lib/llvm-6.0/lib |
| 27 | /usr/local/llvm70/lib | ||
| 23 | /mingw64/lib | 28 | /mingw64/lib |
| 24 | /c/msys64/mingw64/lib | 29 | /c/msys64/mingw64/lib |
| 25 | c:/msys64/mingw64/lib) | 30 | c:/msys64/mingw64/lib) |
cmake/Findllvm.cmake+1-1
| ... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,7 @@ |
| 8 | # LLVM_LIBDIRS | 8 | # LLVM_LIBDIRS |
| 9 | 9 | ||
| 10 | find_program(LLVM_CONFIG_EXE | 10 | find_program(LLVM_CONFIG_EXE |
| 11 | NAMES llvm-config-7 llvm-config-7.0 llvm-config | 11 | NAMES llvm-config-7 llvm-config-7.0 llvm-config70 llvm-config |
| 12 | PATHS | 12 | PATHS |
| 13 | "/mingw64/bin" | 13 | "/mingw64/bin" |
| 14 | "/c/msys64/mingw64/bin" | 14 | "/c/msys64/mingw64/bin" |