Skip to content

Commit e4ace23

Browse files
WiX: Fix single-arch builds for static experimental SDK
1 parent 73d91f7 commit e4ace23

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

platforms/Windows/rtl/static/msm/rtl.static.msm.wxs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
22

3-
<?if $(sys.BUILDARCH) == x86 ?>
3+
<?if $(ProductArchitecture) == x86 ?>
44
<?define RuntimeDirectoryComponentGuidGenerationSeed = "D3021274-DCA3-4369-82D3-B6CEE436A3FC" ?>
55
<?define ModuleID = "53C54287-A59A-4828-A526-4F64E00B340E" ?>
6-
<?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?>
7-
<?elseif $(sys.BUILDARCH) == x64 ?>
6+
<?define RuntimeRoot = $(WindowsExperimentalRuntimeX86)?>
7+
<?elseif $(ProductArchitecture) == x64 ?>
88
<?define RuntimeDirectoryComponentGuidGenerationSeed = "639A8564-3505-4424-BA2F-449AAF743A90" ?>
99
<?define ModuleID = "F84DDCA4-72B0-42AB-9316-21DBAB241540" ?>
10-
<?define RuntimeRoot = $(WindowsExperimentalRuntimeARM64)?>
11-
<?elseif $(sys.BUILDARCH) == arm64 ?>
10+
<?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?>
11+
<?elseif $(ProductArchitecture) == arm64 ?>
1212
<?define RuntimeDirectoryComponentGuidGenerationSeed = "F8BF026F-8E3F-42B5-A5E7-E0A4D186EDF3" ?>
1313
<?define ModuleID = "0439EF46-C6C2-43DF-A5A7-8F4C3F5C64A7" ?>
14-
<?define RuntimeRoot = $(WindowsExperimentalRuntimeX86)?>
14+
<?define RuntimeRoot = $(WindowsExperimentalRuntimeARM64)?>
1515
<?endif?>
1616

1717
<Module Guid="$(ModuleID)" Id="swift_runtime" Language="0" Version="$(NonSemVerProductVersion)">

0 commit comments

Comments
 (0)