authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-04-11 06:44:45-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-04-11 06:44:45-04:00
log403eb92a626e44ab456099fe48fa221639e2e2f5
treeb7d14bb7a123a61fc89cf82e68d0f832a31e15ef
parent2864359950f8ebd9eca70a94801b78c4a0ed9955

try harder to find lld


1 files changed, 22 insertions(+), 18 deletions(-)

cmake/Findlld.cmake+22-18
...@@ -11,28 +11,32 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h...@@ -11,28 +11,32 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h
11 /usr/lib/llvm-4.0/include11 /usr/lib/llvm-4.0/include
12 /mingw64/include)12 /mingw64/include)
1313
14find_library(LLD_LIBRARY NAMES lld-4.0 lld PATHS /usr/lib/llvm-4.0/lib)
15if(LLD_LIBRARY)
16 set(LLD_LIBRARIES ${LLD_LIBRARY})
17else()
14 macro(FIND_AND_ADD_LLD_LIB _libname_)18 macro(FIND_AND_ADD_LLD_LIB _libname_)
15 string(TOUPPER ${_libname_} _prettylibname_)19 string(TOUPPER ${_libname_} _prettylibname_)
16 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}20 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
17 PATHS21 PATHS
18 /usr/lib/llvm-4.0/lib22 /usr/lib/llvm-4.0/lib
19 /mingw64/lib)23 /mingw64/lib)
20 if(LLD_${_prettylibname_}_LIB)24 if(LLD_${_prettylibname_}_LIB)
21 set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB})25 set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB})
22 endif()26 endif()
23endmacro(FIND_AND_ADD_LLD_LIB)27 endmacro(FIND_AND_ADD_LLD_LIB)
2428
25FIND_AND_ADD_LLD_LIB(lldDriver)29 FIND_AND_ADD_LLD_LIB(lldDriver)
26FIND_AND_ADD_LLD_LIB(lldELF)30 FIND_AND_ADD_LLD_LIB(lldELF)
27FIND_AND_ADD_LLD_LIB(lldCOFF)31 FIND_AND_ADD_LLD_LIB(lldCOFF)
28FIND_AND_ADD_LLD_LIB(lldMachO)32 FIND_AND_ADD_LLD_LIB(lldMachO)
29FIND_AND_ADD_LLD_LIB(lldReaderWriter)33 FIND_AND_ADD_LLD_LIB(lldReaderWriter)
30FIND_AND_ADD_LLD_LIB(lldCore)34 FIND_AND_ADD_LLD_LIB(lldCore)
31FIND_AND_ADD_LLD_LIB(lldYAML)35 FIND_AND_ADD_LLD_LIB(lldYAML)
32FIND_AND_ADD_LLD_LIB(lldConfig)36 FIND_AND_ADD_LLD_LIB(lldConfig)
37endif()
3338
34include(FindPackageHandleStandardArgs)39include(FindPackageHandleStandardArgs)
35find_package_handle_standard_args(LLD DEFAULT_MSG LLD_LIBRARIES LLD_INCLUDE_DIRS)40find_package_handle_standard_args(LLD DEFAULT_MSG LLD_LIBRARIES LLD_INCLUDE_DIRS)
3641
37mark_as_advanced(LLD_INCLUDE_DIRS LLD_LIBRARIES)42mark_as_advanced(LLD_INCLUDE_DIRS LLD_LIBRARIES)
38