Skip to content

Commit

Permalink
WiX: package features.json for clang
Browse files Browse the repository at this point in the history
Include `features.json` from clang to allow tooling to detect features supported by the C/C++ compiler.

Fixes: swiftlang/swift#74634
  • Loading branch information
compnerd committed Sep 13, 2024
1 parent 8cdefcb commit c55ebbd
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions platforms/Windows/bld/bld.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
</DirectoryRef>

<DirectoryRef Id="_usr_share">
<Directory Id="_usr_share_clang" Name="clang" />
<Directory Id="_usr_share_swift" Name="swift" />
</DirectoryRef>

Expand Down Expand Up @@ -151,7 +152,15 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="ClangFeatures" Directory="_usr_share_clang">
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\share\clang\features.json" />
</Component>
</ComponentGroup>

<ComponentGroup Id="clang" Directory="_usr_bin">
<ComponentGroupRef Id="ClangFeatures" />

<!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-cl.exe" />
Expand Down

0 comments on commit c55ebbd

Please sign in to comment.