[PATCH] D34998: Check for Haiku when setting LIB_NAMES for GNU ld

Jérôme Duval via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 5 01:03:23 PDT 2017


korli created this revision.
Herald added a subscriber: mgorny.

Haiku uses GNU ld for linking, but is not captured in the conditional when setting LIB_NAMES. This causes a shared library with no symbols on Haiku. 
This patch simply adds a check for whether the CMake system name is Haiku in addition to the existing checks.


Repository:
  rL LLVM

https://reviews.llvm.org/D34998

Files:
  tools/llvm-shlib/CMakeLists.txt


Index: tools/llvm-shlib/CMakeLists.txt
===================================================================
--- tools/llvm-shlib/CMakeLists.txt
+++ tools/llvm-shlib/CMakeLists.txt
@@ -37,7 +37,7 @@
 add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
 
 list(REMOVE_DUPLICATES LIB_NAMES)
-if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
+if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
   configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
   ${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34998.105225.patch
Type: text/x-patch
Size: 855 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170705/9ebd61df/attachment-0001.bin>


More information about the llvm-commits mailing list