diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-07-01 15:52:54 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-07-01 15:52:54 -0700 |
| commit | c89dd15e1be4959800dc7092d7dd4375253db7bc (patch) | |
| tree | ca184ae53592efa21e67128a5f891d642d7f1118 /cmake | |
| parent | 5466e87fce581f2ef90ac23bb80b1dbc05836fc6 (diff) | |
| parent | 2360f8c490f3ec684ed64ff28e8c1fade249070b (diff) | |
| download | zig-c89dd15e1be4959800dc7092d7dd4375253db7bc.tar.gz zig-c89dd15e1be4959800dc7092d7dd4375253db7bc.zip | |
Merge remote-tracking branch 'origin/master' into llvm14
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findlld.cmake | 1 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 16 |
2 files changed, 4 insertions, 13 deletions
diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index 943248da57..ea57b0f8c0 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -49,6 +49,7 @@ else() FIND_AND_ADD_LLD_LIB(lldELF) FIND_AND_ADD_LLD_LIB(lldCOFF) FIND_AND_ADD_LLD_LIB(lldWasm) + FIND_AND_ADD_LLD_LIB(lldMachO) FIND_AND_ADD_LLD_LIB(lldReaderWriter) FIND_AND_ADD_LLD_LIB(lldCore) FIND_AND_ADD_LLD_LIB(lldYAML) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index feb1017e72..39ab79f514 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -12,6 +12,7 @@ find_path(LLVM_INCLUDE_DIRS NAMES llvm/IR/IRBuilder.h /usr/lib/llvm/14/include /usr/lib/llvm-14/include /usr/lib/llvm-14.0/include + /usr/lib/llvm14/include /usr/local/llvm14/include /usr/local/llvm140/include /usr/local/opt/llvm@14/include @@ -31,6 +32,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB) /usr/lib/llvm/14/lib /usr/lib/llvm/14/lib64 /usr/lib/llvm-14/lib + /usr/lib/llvm14/lib /usr/local/llvm14/lib /usr/local/llvm140/lib /usr/local/opt/llvm@14/lib @@ -181,19 +183,7 @@ else() macro(FIND_AND_ADD_LLVM_LIB _libname_) string(TOUPPER ${_libname_} _prettylibname_) - find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_} - PATHS - ${LLVM_LIBDIRS} - /usr/lib/llvm/14/lib - /usr/lib/llvm-14/lib - /usr/lib/llvm-14.0/lib - /usr/local/llvm140/lib - /usr/local/llvm14/lib - /usr/local/opt/llvm@14/lib - /opt/homebrew/opt/llvm@14/lib - /mingw64/lib - /c/msys64/mingw64/lib - c:\\msys64\\mingw64\\lib) + find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_} PATHS ${LLVM_LIBDIRS}) set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_${_prettylibname_}_LIB}) endmacro(FIND_AND_ADD_LLVM_LIB) |