Skip to content

Commit 90a2bde

Browse files
[CMake] clang-builtin-headers needs to copy the module maps as well as the headers
When copying the clang builtin headers, the module maps need to go with them. rdar://139084511
1 parent df7cac3 commit 90a2bde

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,12 @@ endif()
238238
swift_install_in_component(DIRECTORY "${clang_headers_location}/"
239239
DESTINATION "lib/swift/clang"
240240
COMPONENT clang-builtin-headers
241-
PATTERN "*.h")
241+
REGEX "\.(h|modulemap)$")
242242

243243
swift_install_in_component(DIRECTORY "${clang_headers_location}/"
244244
DESTINATION "lib/swift_static/clang"
245245
COMPONENT clang-builtin-headers
246-
PATTERN "*.h")
246+
REGEX "\.(h|modulemap)$")
247247

248248
if(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER OR SWIFT_PREBUILT_CLANG)
249249
# This will still link against the Swift-forked clang headers if the Swift
@@ -274,4 +274,4 @@ file(TO_CMAKE_PATH "${LLVM_LIBRARY_OUTPUT_INTDIR}"
274274
swift_install_in_component(DIRECTORY "${_SWIFT_SHIMS_PATH_TO_CLANG_LIB_BUILD}/clang"
275275
DESTINATION "lib"
276276
COMPONENT clang-builtin-headers-in-clang-resource-dir
277-
PATTERN "*.h")
277+
REGEX "\.(h|modulemap)$")

0 commit comments

Comments
 (0)