diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-09-19 15:38:36 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-09-19 15:38:36 -0400 |
| commit | 287f5cce50ff5fb1b9515ce8b7c38339c9d22472 (patch) | |
| tree | ebda16862a20423c9bcb3358f02168f236531ba8 | |
| parent | e3d8cae35a5d194386eacd9afa4f496111a37e16 (diff) | |
| download | zig-287f5cce50ff5fb1b9515ce8b7c38339c9d22472.tar.gz zig-287f5cce50ff5fb1b9515ce8b7c38339c9d22472.zip | |
build: fix finding llvm and clang 7
| -rwxr-xr-x | ci/travis_linux_install | 2 | ||||
| -rw-r--r-- | cmake/Findclang.cmake | 2 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ci/travis_linux_install b/ci/travis_linux_install index 037edaa282..f2561cb4d8 100755 --- a/ci/travis_linux_install +++ b/ci/travis_linux_install @@ -4,4 +4,4 @@ set -x sudo apt-get remove -y llvm-* sudo rm -rf /usr/local/* -sudo apt-get install -y clang-7 libclang-7-dev llvm-7 llvm-7-dev cmake s3cmd +sudo apt-get install -y libxml2-dev clang-7 libclang-7-dev llvm-7 llvm-7-dev cmake s3cmd diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index c2845da62f..ea1bc91d7b 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -28,6 +28,7 @@ else() find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h PATHS /usr/lib/llvm/7/include + /usr/lib/llvm-7/include /usr/lib/llvm-7.0/include /mingw64/include) @@ -37,6 +38,7 @@ else() PATHS ${CLANG_LIBDIRS} /usr/lib/llvm/7/lib + /usr/lib/llvm-7/lib /usr/lib/llvm-7.0/lib /mingw64/lib /c/msys64/mingw64/lib diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index a554fc21d6..9a4fa3f31c 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -8,7 +8,7 @@ # LLVM_LIBDIRS find_program(LLVM_CONFIG_EXE - NAMES llvm-config llvm-config-7.0 + NAMES llvm-config llvm-config-7 llvm-config-7.0 PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" @@ -62,7 +62,7 @@ execute_process( set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) if(NOT LLVM_LIBRARIES) - find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7.0 LLVM-7) + find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7 LLVM-7.0) endif() link_directories("${CMAKE_PREFIX_PATH}/lib") |