| author |  Andrew Kelley <andrew@ziglang.org> 2018-09-19 15:38:36-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2018-09-19 15:38:36-04:00 |
| log | 287f5cce50ff5fb1b9515ce8b7c38339c9d22472 |
| tree | ebda16862a20423c9bcb3358f02168f236531ba8 |
| parent | e3d8cae35a5d194386eacd9afa4f496111a37e16 |
| signature |  Commit is signed but in an unrecognized format. |
build: fix finding llvm and clang 7
3 files changed, 5 insertions(+), 3 deletions(-)
ci/travis_linux_install+1-1
| ... | @@ -4,4 +4,4 @@ set -x | ... | @@ -4,4 +4,4 @@ set -x |
| 4 | 4 | ||
| 5 | sudo apt-get remove -y llvm-* | 5 | sudo apt-get remove -y llvm-* |
| 6 | sudo rm -rf /usr/local/* | 6 | sudo rm -rf /usr/local/* |
| 7 | sudo apt-get install -y clang-7 libclang-7-dev llvm-7 llvm-7-dev cmake s3cmd | 7 | sudo apt-get install -y libxml2-dev clang-7 libclang-7-dev llvm-7 llvm-7-dev cmake s3cmd |
cmake/Findclang.cmake+2
| ... | @@ -28,6 +28,7 @@ else() | ... | @@ -28,6 +28,7 @@ else() |
| 28 | find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h | 28 | find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h |
| 29 | PATHS | 29 | PATHS |
| 30 | /usr/lib/llvm/7/include | 30 | /usr/lib/llvm/7/include |
| 31 | /usr/lib/llvm-7/include | ||
| 31 | /usr/lib/llvm-7.0/include | 32 | /usr/lib/llvm-7.0/include |
| 32 | /mingw64/include) | 33 | /mingw64/include) |
| 33 | 34 | ||
| ... | @@ -37,6 +38,7 @@ else() | ... | @@ -37,6 +38,7 @@ else() |
| 37 | PATHS | 38 | PATHS |
| 38 | ${CLANG_LIBDIRS} | 39 | ${CLANG_LIBDIRS} |
| 39 | /usr/lib/llvm/7/lib | 40 | /usr/lib/llvm/7/lib |
| 41 | /usr/lib/llvm-7/lib | ||
| 40 | /usr/lib/llvm-7.0/lib | 42 | /usr/lib/llvm-7.0/lib |
| 41 | /mingw64/lib | 43 | /mingw64/lib |
| 42 | /c/msys64/mingw64/lib | 44 | /c/msys64/mingw64/lib |
cmake/Findllvm.cmake+2-2
| ... | @@ -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 llvm-config-7.0 | 11 | NAMES llvm-config llvm-config-7 llvm-config-7.0 |
| 12 | PATHS | 12 | PATHS |
| 13 | "/mingw64/bin" | 13 | "/mingw64/bin" |
| 14 | "/c/msys64/mingw64/bin" | 14 | "/c/msys64/mingw64/bin" |
| ... | @@ -62,7 +62,7 @@ execute_process( | ... | @@ -62,7 +62,7 @@ execute_process( |
| 62 | set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) | 62 | set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) |
| 63 | 63 | ||
| 64 | if(NOT LLVM_LIBRARIES) | 64 | if(NOT LLVM_LIBRARIES) |
| 65 | find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7.0 LLVM-7) | 65 | find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7 LLVM-7.0) |
| 66 | endif() | 66 | endif() |
| 67 | 67 | ||
| 68 | link_directories("${CMAKE_PREFIX_PATH}/lib") | 68 | link_directories("${CMAKE_PREFIX_PATH}/lib") |