diff --git a/utils/build.ps1 b/utils/build.ps1 index 1c5df23fbabd9..523312043e1fb 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -1906,12 +1906,6 @@ function Build-mimalloc() { Copy-Item -Path "$BinaryCache\$($Platform.Triple)\mimalloc\bin\$item" -Destination "$($Platform.ToolchainInstallRoot)\usr\bin\" } - # When cross-compiling, bundle the second mimalloc redirect dll as a workaround for - # https://github.com/microsoft/mimalloc/issues/997 - if ($IsCrossCompiling) { - Copy-Item -Path "$BinaryCache\$($Platform.Triple)\mimalloc\bin\mimalloc-redirect$HostSuffix.dll" -Destination "$($Platform.ToolchainInstallRoot)\usr\bin\mimalloc-redirect$BuildSuffix.dll" - } - # TODO: should we split this out into its own function? $Tools = @( "swift.exe", @@ -3139,9 +3133,6 @@ function Build-Installer([Hashtable] $Platform) { $Properties = @{ BundleFlavor = "offline"; ImageRoot = "$(Get-InstallDir $Platform)\"; - # When cross-compiling, bundle the second mimalloc redirect dll as a workaround for - # https://github.com/microsoft/mimalloc/issues/997 - WORKAROUND_MIMALLOC_ISSUE_997 = if ($IsCrossCompiling) { "True" } else { "False" }; INCLUDE_SWIFT_DOCC = $INCLUDE_SWIFT_DOCC; SWIFT_DOCC_BUILD = "$(Get-ProjectBinaryCache $HostPlatform DocC)\release"; SWIFT_DOCC_RENDER_ARTIFACT_ROOT = "${SourceCache}\swift-docc-render-artifact"; diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index fad118e8da457..ebb308d6fbebd 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -177,7 +177,7 @@ "curl": "curl-8_9_1", "libxml2": "v2.11.5", "zlib": "v1.3.1", - "mimalloc": "v3.0.1" + "mimalloc": "v3.0.3" } }, "release/6.2": {