This is an archive of the discontinued LLVM Phabricator instance.

Differential D31445

Fix build error when using -DLLVM_LINK_LLVM_DYLIB=ON
AbandonedPublic

Authored by aleixpol on Mar 28 2017, 4:32 PM.

Details

Reviewers
mgorny
beanz
Summary

Do not try to clean empty list
CMake Error at tools/llvm-shlib/CMakeLists.txt:39 (list):

list sub-command REMOVE_DUPLICATES requires list to be present.
  • Configuring incomplete, errors occurred!

Diff Detail

Event Timeline

aleixpol created this revision.Mar 28 2017, 4:32 PM
Herald added a subscriber: mgorny. · View Herald TranscriptMar 28 2017, 4:32 PM
aleixpol added reviewers: beanz, mgorny.Mar 28 2017, 4:35 PM
aleixpol abandoned this revision.Mar 28 2017, 5:07 PM

Wrong patch, sorry for the noise.

Revision Contents

PathSize
tools/
llvm-shlib/
4 lines

Diff 93319

tools/llvm-shlib/CMakeLists.txt

Show All 30 Lines
if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE) if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
set(LLVM_EXPORTED_SYMBOL_FILE ${LLVM_DYLIB_EXPORTED_SYMBOL_FILE}) set(LLVM_EXPORTED_SYMBOL_FILE ${LLVM_DYLIB_EXPORTED_SYMBOL_FILE})
add_custom_target(libLLVMExports DEPENDS ${LLVM_EXPORTED_SYMBOL_FILE}) add_custom_target(libLLVMExports DEPENDS ${LLVM_EXPORTED_SYMBOL_FILE})
endif() endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
if(LIB_NAMES)
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
endif()
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 ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
# GNU ld doesn't resolve symbols in the version script. # GNU ld doesn't resolve symbols in the version script.
set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
endif() endif()
target_link_libraries(LLVM PRIVATE ${LIB_NAMES}) target_link_libraries(LLVM PRIVATE ${LIB_NAMES})
▲ Show 20 Lines • Show All 46 Lines • Show Last 20 Lines