Skip to content

Commit 58eafc7

Browse files
committed
Merge pull request #2331 from rintaro/runtime-cmake-add_custom_command_target
2 parents a72773a + 93b4ed1 commit 58eafc7

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

stdlib/public/runtime/CMakeLists.txt

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
7474
add_swift_library(section_magic_begin IS_STDLIB IS_STDLIB_CORE
7575
swift_sections.S
7676
C_COMPILE_FLAGS ${swift_runtime_compile_flags} "-DSWIFT_BEGIN"
77-
INSTALL_IN_COMPONENT stdlib)
77+
INSTALL_IN_COMPONENT never_install)
7878
add_swift_library(section_magic_end IS_STDLIB IS_STDLIB_CORE
7979
swift_sections.S
8080
C_COMPILE_FLAGS ${swift_runtime_compile_flags} "-DSWIFT_END"
81-
INSTALL_IN_COMPONENT stdlib)
81+
INSTALL_IN_COMPONENT never_install)
8282
endif()
8383

8484
set(object_target_list)
@@ -89,17 +89,23 @@ foreach(sdk ${SWIFT_CONFIGURED_SDKS})
8989

9090
set(section_magic_begin_name "section_magic_begin-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
9191
set(section_magic_end_name "section_magic_end-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
92-
add_custom_command_target(${section_magic_begin_name}_begin
93-
OUTPUT "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
94-
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_begin_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}" "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
95-
DEPENDS ${section_magic_begin_name})
92+
add_custom_command_target(section_magic_o
93+
COMMAND
94+
"${CMAKE_COMMAND}" -E copy
95+
"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_begin_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}"
96+
"${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
97+
COMMAND
98+
"${CMAKE_COMMAND}" -E copy
99+
"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_end_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}"
100+
"${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
101+
OUTPUT
102+
"${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
103+
"${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
104+
DEPENDS
105+
${section_magic_begin_name}
106+
${section_magic_end_name})
96107

97-
add_custom_command_target(${section_magic_begin_name}_end
98-
OUTPUT "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
99-
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_end_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}" "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
100-
DEPENDS ${section_magic_end_name})
101-
102-
list(APPEND object_target_list "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o" "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o")
108+
list(APPEND object_target_list "${section_magic_o}")
103109

104110
swift_install_in_component(stdlib
105111
FILES "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o" "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"

0 commit comments

Comments
 (0)