Skip to content

Commit f527f72

Browse files
Merge pull request #66423 from kateinoigakukun/pr-0c7c2f57b05a694965ab652f57cbfead006a33d7
[static-stdlib] Move static-executable-args.lnk under stdlib/public/Resources/linux
2 parents 199616a + 2410da4 commit f527f72

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

stdlib/public/runtime/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,19 @@ set(sdk "${SWIFT_HOST_VARIANT_SDK}")
106106
if(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "LINUX")
107107
set(static_binary_lnk_file_list)
108108
string(TOLOWER "${sdk}" lowercase_sdk)
109+
set(static_binary_lnk_src "${SWIFT_SOURCE_DIR}/stdlib/public/Resources/${lowercase_sdk}/static-executable-args.lnk")
109110

110111
# Generate the static-executable-args.lnk file used for ELF systems (eg linux)
111112
set(linkfile "${lowercase_sdk}/static-executable-args.lnk")
112113
add_custom_command_target(swift_static_binary_${sdk}_args
113114
COMMAND
114115
"${CMAKE_COMMAND}" -E copy
115-
"${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk"
116+
"${static_binary_lnk_src}"
116117
"${SWIFTSTATICLIB_DIR}/${linkfile}"
117118
OUTPUT
118119
"${SWIFTSTATICLIB_DIR}/${linkfile}"
119120
DEPENDS
120-
"${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk")
121+
"${static_binary_lnk_src}")
121122

122123
list(APPEND static_binary_lnk_file_list ${swift_static_binary_${sdk}_args})
123124
swift_install_in_component(FILES "${SWIFTSTATICLIB_DIR}/${linkfile}"

0 commit comments

Comments
 (0)