Skip to content

Commit 1a54b6b

Browse files
committed
WiX: remove workaround for mimalloc
Remove the extra library packaging which was a workaround for mimalloc adding a reference to foreign architecture modules.
1 parent 6183cce commit 1a54b6b

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

platforms/Windows/bld/bld.wixproj

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
$(DefineConstants);
55
_USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
66
_USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
7-
WORKAROUND_MIMALLOC_ISSUE_997=$(WORKAROUND_MIMALLOC_ISSUE_997);
87
</DefineConstants>
98
</PropertyGroup>
109

platforms/Windows/bld/bld.wxs

-9
Original file line numberDiff line numberDiff line change
@@ -535,15 +535,6 @@
535535
<File Source="$(ToolchainRoot)\usr\bin\mimalloc-redirect-arm64.dll" />
536536
<?endif?>
537537
</Component>
538-
<?if $(WORKAROUND_MIMALLOC_ISSUE_997) = True?>
539-
<Component>
540-
<?if $(ProductArchitecture) = "amd64" ?>
541-
<File Source="$(ToolchainRoot)\usr\bin\mimalloc-redirect-arm64.dll" />
542-
<?elseif $(ProductArchitecture) = "arm64" ?>
543-
<File Source="$(ToolchainRoot)\usr\bin\mimalloc-redirect.dll" />
544-
<?endif?>
545-
</Component>
546-
<?endif?>
547538
</ComponentGroup>
548539

549540
<ComponentGroup Id="Configuration">

0 commit comments

Comments
 (0)