This is an archive of the discontinued LLVM Phabricator instance.

Differential D25865

Fix llvm-shlib cmake build
ClosedPublic

Authored by vchuravy on Oct 21 2016, 1:32 AM.

Details

Reviewers
axw
beanz
Commits
rG3603e6123832: Fix llvm-shlib cmake build
rL285737: Fix llvm-shlib cmake build
Summary

This fixes a few things that used to work with a Makefile build, but were broken in cmake.

  1. Treat MINGW like a Linux system.
  2. The shlib should never contain other shared libraries.

Diff Detail

Repository
rL LLVM

Event Timeline

vchuravy updated this revision to Diff 75398.Oct 21 2016, 1:32 AM
vchuravy retitled this revision from to Fix llvm-shlib cmake build.
vchuravy updated this object.
Herald added subscribers: mgorny, beanz. · View Herald TranscriptOct 21 2016, 1:32 AM
vchuravy added reviewers: axw, beanz.Oct 21 2016, 1:34 AM
axw edited edge metadata.Oct 23 2016, 6:37 PM

Couple of little things, LGTM otherwise.

tools/llvm-shlib/CMakeLists.txt
11 ↗(On Diff #75398)

if(LLVM_LINK_LLVM_DYLIB AND LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
?

17 ↗(On Diff #75398)

LLVM_BUILD_LLVM_DYLIB is implied by this file being processed, so just make this unconditional?

vchuravy updated this revision to Diff 75556.Oct 23 2016, 9:08 PM
vchuravy edited edge metadata.

Address review comments

Herald added a subscriber: modocache. · View Herald TranscriptOct 23 2016, 9:08 PM
vchuravy marked 2 inline comments as done.Oct 23 2016, 9:09 PM
axw accepted this revision.Oct 23 2016, 10:26 PM
axw edited edge metadata.
This revision is now accepted and ready to land.Oct 23 2016, 10:26 PM
beanz accepted this revision.Oct 26 2016, 12:39 PM
beanz edited edge metadata.

LGTM!

vchuravy added a comment.Oct 31 2016, 6:50 PM

Since I am new to LLVM I was wondering what the process of landing this is?

Closed by commit rL285737: Fix llvm-shlib cmake build (authored by cbieneman). · Explain WhyNov 1 2016, 1:29 PM
This revision was automatically updated to reflect the committed changes.
beanz added a comment.Nov 1 2016, 1:29 PM

I have landed your patch in rL285737.

Thank you for your contribution!

-Chris

Revision Contents

PathSize
llvm/
trunk/
tools/
llvm-shlib/
42 lines

Diff 76624

llvm/trunk/tools/llvm-shlib/CMakeLists.txt

# This tool creates a shared library from the LLVM libraries. Generating this # This tool creates a shared library from the LLVM libraries. Generating this
# library is enabled by setting LLVM_BUILD_LLVM_DYLIB=yes on the CMake # library is enabled by setting LLVM_BUILD_LLVM_DYLIB=yes on the CMake
# commandline. By default the shared library only exports the LLVM C API. # commandline. By default the shared library only exports the LLVM C API.
set(SOURCES set(SOURCES
libllvm.cpp libllvm.cpp
) )
llvm_map_components_to_libnames(LIB_NAMES ${LLVM_DYLIB_COMPONENTS}) llvm_map_components_to_libnames(LIB_NAMES ${LLVM_DYLIB_COMPONENTS})
if(LLVM_LINK_LLVM_DYLIB) if(LLVM_LINK_LLVM_DYLIB AND LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
message(WARNING "Using LLVM_LINK_LLVM_DYLIB with LLVM_DYLIB_EXPORTED_SYMBOL_FILE may not work. Use at your own risk.") message(WARNING "Using LLVM_LINK_LLVM_DYLIB with LLVM_DYLIB_EXPORTED_SYMBOL_FILE may not work. Use at your own risk.")
endif() endif()
# libLLVM.so should not have any dependencies on any other LLVM # libLLVM.so should not have any dependencies on any other LLVM
# shared libraries. When using the "all" pseudo-component, # shared libraries. When using the "all" pseudo-component,
# LLVM_AVAILABLE_LIBS is added to the dependencies, which may # LLVM_AVAILABLE_LIBS is added to the dependencies, which may
# contain shared libraries (e.g. libLTO). # contain shared libraries (e.g. libLTO).
# #
# Also exclude libLLVMTableGen for the following reasons: # Also exclude libLLVMTableGen for the following reasons:
# - it is only used by internal *-tblgen utilities; # - it is only used by internal *-tblgen utilities;
# - it pollutes the global options space. # - it pollutes the global options space.
foreach(lib ${LIB_NAMES}) foreach(lib ${LIB_NAMES})
get_target_property(t ${lib} TYPE) get_target_property(t ${lib} TYPE)
if("${lib}" STREQUAL "LLVMTableGen") if("${lib}" STREQUAL "LLVMTableGen")
elseif("x${t}" STREQUAL "xSTATIC_LIBRARY") elseif("x${t}" STREQUAL "xSTATIC_LIBRARY")
list(APPEND FILTERED_LIB_NAMES ${lib}) list(APPEND FILTERED_LIB_NAMES ${lib})
endif() endif()
endforeach() endforeach()
set(LIB_NAMES ${FILTERED_LIB_NAMES}) set(LIB_NAMES ${FILTERED_LIB_NAMES})
endif()
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})
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf" if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # 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 45 Lines • Show Last 20 Lines