mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-03 12:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths to find llvm/clang on DragonFly

Browse Source
This commit is contained in:
Michael Neumann 2020-04-07 17:13:33 +02:00
parent ab05766674
commit 7a829a7015
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Findclang.cmake
View File

@ -13,6 +13,7 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
/usr/lib/llvm-10/include /usr/lib/llvm-10/include
/usr/lib/llvm-10.0/include /usr/lib/llvm-10.0/include
/usr/local/llvm100/include /usr/local/llvm100/include
/usr/local/llvm10/include
/mingw64/include) /mingw64/include)
macro(FIND_AND_ADD_CLANG_LIB _libname_) macro(FIND_AND_ADD_CLANG_LIB _libname_)
@ -24,6 +25,7 @@ macro(FIND_AND_ADD_CLANG_LIB _libname_)
/usr/lib/llvm-10/lib /usr/lib/llvm-10/lib
/usr/lib/llvm-10.0/lib /usr/lib/llvm-10.0/lib
/usr/local/llvm100/lib /usr/local/llvm100/lib
/usr/local/llvm10/lib
/mingw64/lib /mingw64/lib
/c/msys64/mingw64/lib /c/msys64/mingw64/lib
c:\\msys64\\mingw64\\lib) c:\\msys64\\mingw64\\lib)

3
cmake/Findlld.cmake
View File

@ -10,12 +10,14 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
PATHS PATHS
/usr/lib/llvm-10/include /usr/lib/llvm-10/include
/usr/local/llvm100/include /usr/local/llvm100/include
/usr/local/llvm10/include
/mingw64/include) /mingw64/include)
find_library(LLD_LIBRARY NAMES lld-10.0 lld100 lld find_library(LLD_LIBRARY NAMES lld-10.0 lld100 lld
PATHS PATHS
/usr/lib/llvm-10/lib /usr/lib/llvm-10/lib
/usr/local/llvm100/lib /usr/local/llvm100/lib
/usr/local/llvm10/lib
) )
if(EXISTS ${LLD_LIBRARY}) if(EXISTS ${LLD_LIBRARY})
set(LLD_LIBRARIES ${LLD_LIBRARY}) set(LLD_LIBRARIES ${LLD_LIBRARY})
@ -27,6 +29,7 @@ else()
${LLD_LIBDIRS} ${LLD_LIBDIRS}
/usr/lib/llvm-10/lib /usr/lib/llvm-10/lib
/usr/local/llvm100/lib /usr/local/llvm100/lib
/usr/local/llvm10/lib
/mingw64/lib /mingw64/lib
/c/msys64/mingw64/lib /c/msys64/mingw64/lib
c:/msys64/mingw64/lib) c:/msys64/mingw64/lib)

4
cmake/Findllvm.cmake
View File

@ -9,7 +9,7 @@
if("${ZIG_TARGET_TRIPLE}" STREQUAL "native") if("${ZIG_TARGET_TRIPLE}" STREQUAL "native")
find_program(LLVM_CONFIG_EXE find_program(LLVM_CONFIG_EXE
NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config10 llvm-config
PATHS PATHS
"/mingw64/bin" "/mingw64/bin"
"/c/msys64/mingw64/bin" "/c/msys64/mingw64/bin"
@ -130,6 +130,7 @@ else()
/usr/lib/llvm-10/include /usr/lib/llvm-10/include
/usr/lib/llvm-10.0/include /usr/lib/llvm-10.0/include
/usr/local/llvm100/include /usr/local/llvm100/include
/usr/local/llvm10/include
/mingw64/include) /mingw64/include)
macro(FIND_AND_ADD_LLVM_LIB _libname_) macro(FIND_AND_ADD_LLVM_LIB _libname_)
@ -141,6 +142,7 @@ else()
/usr/lib/llvm-10/lib /usr/lib/llvm-10/lib
/usr/lib/llvm-10.0/lib /usr/lib/llvm-10.0/lib
/usr/local/llvm100/lib /usr/local/llvm100/lib
/usr/local/llvm10/lib
/mingw64/lib /mingw64/lib
/c/msys64/mingw64/lib /c/msys64/mingw64/lib
c:\\msys64\\mingw64\\lib) c:\\msys64\\mingw64\\lib)