@@ -146,28 +146,35 @@ foreach(sdk ${SWIFT_SDKS})
146146
147147 list (APPEND glibc_modulemap_target_list ${glibc_modulemap_target} )
148148
149+ set (glibc_header_out "${module_dir} /SwiftGlibc.h" )
150+ set (glibc_header_out_static "${module_dir_static} /SwiftGlibc.h" )
151+ handle_gyb_source_single(glibc_header_target
152+ SOURCE "SwiftGlibc.h.gyb"
153+ OUTPUT "${glibc_header_out} "
154+ FLAGS "-DCMAKE_SDK=${sdk} " )
155+ list (APPEND glibc_modulemap_target_list ${glibc_header_target} )
156+
149157 if (SWIFT_BUILD_STATIC_STDLIB)
150158 add_custom_command_target(
151- copy_glibc_modulemap_static
159+ copy_glibc_modulemap_header_static
152160 COMMAND
153161 "${CMAKE_COMMAND} " "-E" "make_directory" ${module_dir_static}
154162 COMMAND
155- "${CMAKE_COMMAND} " "-E" "copy" ${glibc_modulemap_out} ${glibc_modulemap_out_static}
156- OUTPUT ${glibc_modulemap_out_static}
163+ "${CMAKE_COMMAND} " "-E" "copy"
164+ ${glibc_modulemap_out} ${glibc_modulemap_out_static}
165+ COMMAND
166+ "${CMAKE_COMMAND} " "-E" "copy"
167+ ${glibc_header_out} ${glibc_header_out_static}
168+ OUTPUT ${glibc_modulemap_out_static} ${glibc_header_out_static}
157169 DEPENDS
158170 "${glibc_modulemap_target} "
159- COMMENT "Copying Glibc modulemap to static resources" )
171+ "${glibc_header_target} "
172+ COMMENT "Copying Glibc modulemap and header to static resources" )
160173
161- list (APPEND glibc_modulemap_target_list ${copy_glibc_modulemap_static} )
174+ list (APPEND glibc_modulemap_target_list
175+ ${copy_glibc_modulemap_header_static} )
162176 endif ()
163177
164- set (glibc_header_out "${module_dir} /SwiftGlibc.h" )
165- handle_gyb_source_single(glibc_header_target
166- SOURCE "SwiftGlibc.h.gyb"
167- OUTPUT "${glibc_header_out} "
168- FLAGS "-DCMAKE_SDK=${sdk} " )
169- list (APPEND glibc_modulemap_target_list ${glibc_header_target} )
170-
171178 # If this SDK is a target for a non-native host, except if it's for Android
172179 # with its own native sysroot, create a native modulemap without a sysroot
173180 # prefix. This is the one we'll install instead.
0 commit comments