This is an archive of the discontinued LLVM Phabricator instance.

Check for Haiku when setting LIB_NAMES for GNU ld
ClosedPublic

Authored by korli on Jul 5 2017, 1:03 AM.

Download Raw Diff

Details

Reviewers

axw
chandlerc
rengolin

Commits

rG098b147347d3: [cmake] Check for Haiku when setting LIB_NAMES for GNU ld
rL307607: [cmake] Check for Haiku when setting LIB_NAMES for GNU ld

Summary

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.

Diff Detail

Repository: rL LLVM

Event Timeline

korli created this revision.Jul 5 2017, 1:03 AM

Herald added a subscriber: mgorny. · View Herald TranscriptJul 5 2017, 1:03 AM

axw accepted this revision.Jul 6 2017, 7:38 PM

This revision is now accepted and ready to land.Jul 6 2017, 7:38 PM

I haven't commit access. Could you commit the change?

Closed by commit rL307607: [cmake] Check for Haiku when setting LIB_NAMES for GNU ld (authored by axw). · Explain WhyJul 10 2017, 6:18 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

tools/

llvm-shlib/

CMakeLists.txt

2 lines

Diff 105225

tools/llvm-shlib/CMakeLists.txt

Context not available.
	add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})	add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})

	list(REMOVE_DUPLICATES LIB_NAMES)	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(	configure_file(
	${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in	${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
	${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)	${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)
Context not available.