aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-09-03 23:52:19 -0700
committerAndrew Kelley <andrew@ziglang.org>2020-09-03 23:52:19 -0700
commit338f155a02b72117ff710f72c8578e7d2f8eb296 (patch)
treea902526d5dc901de7458ef318f52f5ac0dad77e7 /cmake
parentc354f074fa91d3d1672469ba4bbc49a1730e1d01 (diff)
parent88724b2a89157ecc3a8eea03aa0f8a6b66829915 (diff)
downloadzig-338f155a02b72117ff710f72c8578e7d2f8eb296.tar.gz
zig-338f155a02b72117ff710f72c8578e7d2f8eb296.zip
Merge remote-tracking branch 'origin/master' into llvm11
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Findclang.cmake2
-rw-r--r--cmake/Findllvm.cmake2
2 files changed, 4 insertions, 0 deletions
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake
index e0ce9c6c85..b4bd80773d 100644
--- a/cmake/Findclang.cmake
+++ b/cmake/Findclang.cmake
@@ -25,6 +25,8 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
clang-cpp
PATHS
${CLANG_LIBDIRS}
+ /usr/lib/llvm/11/lib
+ /usr/lib/llvm/11/lib64
/usr/lib/llvm-11/lib
/usr/local/llvm110/lib
/usr/local/llvm11/lib
diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
index cd2b5182b1..fbd61e9393 100644
--- a/cmake/Findllvm.cmake
+++ b/cmake/Findllvm.cmake
@@ -26,6 +26,8 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
LLVM
PATHS
${LLVM_LIBDIRS}
+ /usr/lib/llvm/11/lib
+ /usr/lib/llvm/11/lib64
/usr/lib/llvm-11/lib
/usr/local/llvm11/lib
/usr/local/llvm110/lib