Merge pull request #381 from swiftlang/revert-375-revert-371-your-allocator

Reland "WiX: simplify mimalloc packaging, require mimalloc"

Author: weliveindetail

platforms/Windows/bld/bld.wixproj

@@ -5,7 +5,6 @@
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
       TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
       TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
-      ENABLE_MIMALLOC=$(ENABLE_MIMALLOC);
       WORKAROUND_MIMALLOC_ISSUE_997=$(WORKAROUND_MIMALLOC_ISSUE_997);
     </DefineConstants>
   </PropertyGroup>

platforms/Windows/bld/bld.wxs

@@ -483,28 +483,23 @@
     </ComponentGroup>
 
     <ComponentGroup Id="mimalloc" Directory="_usr_bin">
-      <?if $(ENABLE_MIMALLOC) == true ?>
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc.dll" />
+      </Component>
+      <Component>
         <?if $(ProductArchitecture) = "amd64" ?>
-          <Component>
-            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
-          </Component>
-          <?if $(WORKAROUND_MIMALLOC_ISSUE_997) ?>
-            <Component>
-              <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
-            </Component>
-          <?endif?>
+          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
         <?elseif $(ProductArchitecture) = "arm64" ?>
-          <Component>
-            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
-          </Component>
-          <?if $(WORKAROUND_MIMALLOC_ISSUE_997) ?>
-            <Component>
-              <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
-            </Component>
-          <?endif?>
+          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
         <?endif?>
+      </Component>
+      <?if $(WORKAROUND_MIMALLOC_ISSUE_997) ?>
         <Component>
-          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc.dll" />
+          <?if $(ProductArchitecture) = "amd64" ?>
+            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
+          <?elseif $(ProductArchitecture) = "arm64" ?>
+            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
+          <?endif?>
         </Component>
       <?endif?>
     </ComponentGroup>