mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmake: also check Homebrew install paths when looking for LLVM

Browse source 
- On Intel Macs, the path is /usr/local/opt/llvm@12
- On Silicon Macs, the path is /opt/homebrew/opt/llvm@12

This makes specifying CMAKE_PREFIX_PATH optional for Homebrew LLVM.
This commit is contained in:
FnControlOption 2021-07-18 16:54:43 -07:00 • committed by Andrew Kelley
parent 175d95b591
commit 23c25c5eaf
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/Findclang.cmake
View file

@ -14,6 +14,8 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
/usr/lib/llvm-12.0/include /usr/lib/llvm-12.0/include
/usr/local/llvm120/include /usr/local/llvm120/include
/usr/local/llvm12/include /usr/local/llvm12/include
/usr/local/opt/llvm@12/include
/opt/homebrew/opt/llvm@12/include
/mingw64/include /mingw64/include
) )
@ -30,6 +32,8 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
/usr/lib/llvm-12/lib /usr/lib/llvm-12/lib
/usr/local/llvm120/lib /usr/local/llvm120/lib
/usr/local/llvm12/lib /usr/local/llvm12/lib
/usr/local/opt/llvm@12/lib
/opt/homebrew/opt/llvm@12/lib
) )
endif() endif()
@ -44,6 +48,8 @@ if(NOT CLANG_LIBRARIES)
/usr/lib/llvm-12.0/lib /usr/lib/llvm-12.0/lib
/usr/local/llvm120/lib /usr/local/llvm120/lib
/usr/local/llvm12/lib /usr/local/llvm12/lib
/usr/local/opt/llvm@12/lib
/opt/homebrew/opt/llvm@12/lib
/mingw64/lib /mingw64/lib
/c/msys64/mingw64/lib /c/msys64/mingw64/lib
c:\\msys64\\mingw64\\lib c:\\msys64\\mingw64\\lib

6
cmake/Findlld.cmake
View file

@ -11,6 +11,8 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
/usr/lib/llvm-12/include /usr/lib/llvm-12/include
/usr/local/llvm120/include /usr/local/llvm120/include
/usr/local/llvm12/include /usr/local/llvm12/include
/usr/local/opt/llvm@12/include
/opt/homebrew/opt/llvm@12/include
/mingw64/include) /mingw64/include)
find_library(LLD_LIBRARY NAMES lld-12.0 lld120 lld find_library(LLD_LIBRARY NAMES lld-12.0 lld120 lld
@ -18,6 +20,8 @@ find_library(LLD_LIBRARY NAMES lld-12.0 lld120 lld
/usr/lib/llvm-12/lib /usr/lib/llvm-12/lib
/usr/local/llvm120/lib /usr/local/llvm120/lib
/usr/local/llvm12/lib /usr/local/llvm12/lib
/usr/local/opt/llvm@12/lib
/opt/homebrew/opt/llvm@12/lib
) )
if(EXISTS ${LLD_LIBRARY}) if(EXISTS ${LLD_LIBRARY})
set(LLD_LIBRARIES ${LLD_LIBRARY}) set(LLD_LIBRARIES ${LLD_LIBRARY})
@ -30,6 +34,8 @@ else()
/usr/lib/llvm-12/lib /usr/lib/llvm-12/lib
/usr/local/llvm120/lib /usr/local/llvm120/lib
/usr/local/llvm12/lib /usr/local/llvm12/lib
/usr/local/opt/llvm@12/lib
/opt/homebrew/opt/llvm@12/lib
/mingw64/lib /mingw64/lib
/c/msys64/mingw64/lib /c/msys64/mingw64/lib
c:/msys64/mingw64/lib) c:/msys64/mingw64/lib)

6
cmake/Findllvm.cmake
View file

@ -14,6 +14,8 @@ find_path(LLVM_INCLUDE_DIRS NAMES llvm/IR/IRBuilder.h
/usr/lib/llvm-12.0/include /usr/lib/llvm-12.0/include
/usr/local/llvm12/include /usr/local/llvm12/include
/usr/local/llvm120/include /usr/local/llvm120/include
/usr/local/opt/llvm@12/include
/opt/homebrew/opt/llvm@12/include
/mingw64/include /mingw64/include
) )
@ -31,6 +33,8 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
/usr/lib/llvm-12/lib /usr/lib/llvm-12/lib
/usr/local/llvm12/lib /usr/local/llvm12/lib
/usr/local/llvm120/lib /usr/local/llvm120/lib
/usr/local/opt/llvm@12/lib
/opt/homebrew/opt/llvm@12/lib
) )
find_program(LLVM_CONFIG_EXE find_program(LLVM_CONFIG_EXE
@ -185,6 +189,8 @@ else()
/usr/lib/llvm-12.0/lib /usr/lib/llvm-12.0/lib
/usr/local/llvm120/lib /usr/local/llvm120/lib
/usr/local/llvm12/lib /usr/local/llvm12/lib
/usr/local/opt/llvm@12/lib
/opt/homebrew/opt/llvm@12/lib
/mingw64/lib /mingw64/lib
/c/msys64/mingw64/lib /c/msys64/mingw64/lib
c:\\msys64\\mingw64\\lib) c:\\msys64\\mingw64\\lib)