Skip to content

Commit fe35b36

Browse files
committed
WiX: package features.json for clang
Include `features.json` from clang to allow tooling to detect features supported by the C/C++ compiler. Fixes: swiftlang/swift#74634
1 parent de8b4a0 commit fe35b36

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

platforms/Windows/bld/bld.wxs

+9
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
</DirectoryRef>
3131

3232
<DirectoryRef Id="_usr_share">
33+
<Directory Id="_usr_share_clang" Name="clang" />
3334
<Directory Id="_usr_share_swift" Name="swift" />
3435
</DirectoryRef>
3536

@@ -151,7 +152,15 @@
151152
</Component>
152153
</ComponentGroup>
153154

155+
<ComponentGroup Id="ClangFeatures" Directory="_usr_share_clang">
156+
<Component>
157+
<File Source="$(TOOLCHAIN_ROOT)\usr\share\clang\features.json" />
158+
</Component>
159+
</ComponentGroup>
160+
154161
<ComponentGroup Id="clang" Directory="_usr_bin">
162+
<ComponentGroupRef Id="ClangFeatures" />
163+
155164
<!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
156165
<Component>
157166
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-cl.exe" />

0 commit comments

Comments
 (0)