motiejus/zig
1
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into llvm8

Browse Source
This commit is contained in:
Andrew Kelley
2018-12-23 17:04:26 -05:00
parent c21884e1d6 45081c1e9c
commit c00216701c
124 changed files with 6601 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Findlld.cmake
View File

@@ -9,9 +9,14 @@
find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
PATHS
/usr/lib/llvm-8.0/include
/usr/local/llvm80/include
/mingw64/include)
find_library(LLD_LIBRARY NAMES lld-8.0 lld PATHS /usr/lib/llvm-8.0/lib)
find_library(LLD_LIBRARY NAMES lld-8.0 lld80 lld
PATHS
/usr/lib/llvm-8.0/lib
/usr/local/llvm80/lib
)
if(EXISTS ${LLD_LIBRARY})
set(LLD_LIBRARIES ${LLD_LIBRARY})
else()
@@ -20,6 +25,7 @@ else()
find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
PATHS
/usr/lib/llvm-8.0/lib
/usr/local/llvm80/lib
/mingw64/lib
/c/msys64/mingw64/lib
c:/msys64/mingw64/lib)