Skip to content

Add basic LLVM_DISTRIBUTION_COMPONENTS compatibility #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonathonpenix wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −3
Open

Add basic LLVM_DISTRIBUTION_COMPONENTS compatibility #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,13 @@ install(
PATTERN "*.template"
PATTERN ".git" EXCLUDE
PATTERN ".svn" EXCLUDE)
if (NOT LLVM_ENABLE_IDE)
# LLVM_DISTRIBUTION_COMPONENTS requires that each component have both a
# component and an install-component target, so add appropriate dummy targets.
add_custom_target(linker-script)
add_llvm_install_targets(install-linker-script
COMPONENT linker-script)
endif()

set(ELD_INSTALL_YAML_MAP_PARSER
ON
Expand All @@ -224,5 +231,13 @@ if(ELD_INSTALL_YAML_MAP_PARSER)
set(ELD_YAML_MAP_PARSER_DEST_DIR "bin")
endif()
install(PROGRAMS utils/YAMLMapParser/YAMLMapParser.py
DESTINATION ${ELD_YAML_MAP_PARSER_DEST_DIR})
DESTINATION ${ELD_YAML_MAP_PARSER_DEST_DIR}
COMPONENT YAMLMapParser)
if (NOT LLVM_ENABLE_IDE)
# LLVM_DISTRIBUTION_COMPONENTS requires that each component have both a
# component and an install-component target, so add appropriate dummy targets.
add_custom_target(YAMLMapParser)
add_llvm_install_targets(install-YAMLMapParser
COMPONENT YAMLMapParser)
endif()
endif()
8 changes: 8 additions & 0 deletions include/eld/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,12 @@ if(ENABLE_ELD_PLUGIN_SUPPORT)
DESTINATION include/ELD/PluginAPI/
COMPONENT PluginAPIHeaders)
endif()

if (NOT LLVM_ENABLE_IDE)
# LLVM_DISTRIBUTION_COMPONENTS requires that each component have both a
# component and an install-component target, so add appropriate dummy targets.
add_custom_target(PluginAPIHeaders)
add_llvm_install_targets(install-PluginAPIHeaders
COMPONENT PluginAPIHeaders)
endif()
endif()
13 changes: 11 additions & 2 deletions tools/eld/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@ configure_file(eld_install.cmake.in
# from top level llvm build directory
configure_file(eld_install.cmake.in ${CMAKE_BINARY_DIR}/eld_install.cmake)

install(TARGETS ld.eld RUNTIME DESTINATION bin)
install(TARGETS ld.eld RUNTIME DESTINATION bin COMPONENT ld.eld)
if (NOT LLVM_ENABLE_IDE)
add_llvm_install_targets(install-ld.eld
DEPENDS ld.eld
COMPONENT ld.eld)
add_dependencies(install-ld.eld install-${LINKER_WRAPPER_LIB})
add_dependencies(install-ld.eld-stripped
install-${LINKER_WRAPPER_LIB}-stripped)
endif()

# FIXME: We need to switch to ELD_TARGETS_TO_BUILD after the buildbot upgrade
if("${LLVM_TARGETS_TO_BUILD}" MATCHES "Hexagon" AND "${TARGET_TRIPLE}" MATCHES
Expand Down Expand Up @@ -79,4 +87,5 @@ if(DEFINED USE_LINKER_ALT_NAME)
endif()

# Create the symlink at installation time.
install(SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/ld_eld_symlink.cmake)
install(SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/ld_eld_symlink.cmake
COMPONENT ld.eld)
Loading