Skip to content

[cxx-interop] Move swift/bridging header to clang resource dir #12861

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
j-hui wants to merge 1 commit into
base: stable/21.x
Choose a base branch
from
Open

[cxx-interop] Move swift/bridging header to clang resource dir #12861

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
23 changes: 22 additions & 1 deletion clang/lib/Headers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ set(hlsl_files
${hlsl_subdir_files}
)

set(swift_bridging_files
swift/bridging
swift/bridging.modulemap
)

set(loongarch_files
larchintrin.h
lasxintrin.h
Expand Down Expand Up @@ -456,7 +461,7 @@ endfunction(clang_generate_header)
# Copy header files from the source directory to the build directory
foreach( f ${files} ${cuda_wrapper_files} ${cuda_wrapper_bits_files}
${ppc_wrapper_files} ${openmp_wrapper_files} ${zos_wrapper_files} ${hlsl_files}
${llvm_libc_wrapper_files} ${llvm_offload_wrapper_files})
${llvm_libc_wrapper_files} ${llvm_offload_wrapper_files} ${swift_bridging_files})
copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
endforeach( f )

Expand Down Expand Up @@ -548,6 +553,7 @@ add_dependencies("clang-resource-headers"
"ppc-htm-resource-headers"
"riscv-resource-headers"
"spirv-resource-headers"
"swift-bridging-resource-headers"
"systemz-resource-headers"
"ve-resource-headers"
"webassembly-resource-headers"
Expand Down Expand Up @@ -581,6 +587,7 @@ add_header_target("gpu-resource-headers" "${gpu_files}")

# Other header groupings
add_header_target("hlsl-resource-headers" ${hlsl_files})
add_header_target("swift-bridging-resource-headers" ${swift_bridging_files})
add_header_target("spirv-resource-headers" ${spirv_files})
add_header_target("opencl-resource-headers" ${opencl_files})
add_header_target("llvm-libc-resource-headers" ${llvm_libc_wrapper_files})
Expand Down Expand Up @@ -637,6 +644,11 @@ install(
DESTINATION ${header_install_dir}/zos_wrappers
COMPONENT clang-resource-headers)

install(
FILES ${swift_bridging_files}
DESTINATION ${header_install_dir}/swift
COMPONENT clang-resource-headers)

#############################################################
# Install rules for separate header lists
install(
Expand Down Expand Up @@ -787,6 +799,12 @@ install(
${EXCLUDE_HLSL}
COMPONENT hlsl-resource-headers)

install(
FILES ${swift_bridging_files}
DESTINATION ${header_install_dir}/swift
EXCLUDE_FROM_ALL
COMPONENT swift-bridging-resource-headers)

install(
FILES ${spirv_files}
DESTINATION ${header_install_dir}
Expand Down Expand Up @@ -881,6 +899,9 @@ if (NOT LLVM_ENABLE_IDE)
add_llvm_install_targets(install-hlsl-resource-headers
DEPENDS hlsl-resource-headers
COMPONENT hlsl-resource-headers)
add_llvm_install_targets(install-swift-bridging-resource-headers
DEPENDS swift-bridging-resource-headers
COMPONENT swift-bridging-resource-headers)
add_llvm_install_targets(install-opencl-resource-headers
DEPENDS opencl-resource-headers
COMPONENT opencl-resource-headers)
Expand Down
2 changes: 2 additions & 0 deletions clang/lib/Headers/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,3 +391,5 @@ module lifetimebound {
export *
}
/* TO_UPSTREAM(Lifetimebound) OFF */

extern module SwiftBridging "swift/bridging.modulemap"
Loading