Skip to content

Commit 96ccca6

Browse files
committed
utils: remove mimalloc workaround
Remove a workaround for the ARM64 toolchain when built with mimalloc which would previously have an erroneous reference to the x64 interceptor.
1 parent b2d1adc commit 96ccca6

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

utils/build.ps1

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,12 +1906,6 @@ function Build-mimalloc() {
19061906
Copy-Item -Path "$BinaryCache\$($Platform.Triple)\mimalloc\bin\$item" -Destination "$($Platform.ToolchainInstallRoot)\usr\bin\"
19071907
}
19081908

1909-
# When cross-compiling, bundle the second mimalloc redirect dll as a workaround for
1910-
# https://github.com/microsoft/mimalloc/issues/997
1911-
if ($IsCrossCompiling) {
1912-
Copy-Item -Path "$BinaryCache\$($Platform.Triple)\mimalloc\bin\mimalloc-redirect$HostSuffix.dll" -Destination "$($Platform.ToolchainInstallRoot)\usr\bin\mimalloc-redirect$BuildSuffix.dll"
1913-
}
1914-
19151909
# TODO: should we split this out into its own function?
19161910
$Tools = @(
19171911
"swift.exe",
@@ -3139,9 +3133,6 @@ function Build-Installer([Hashtable] $Platform) {
31393133
$Properties = @{
31403134
BundleFlavor = "offline";
31413135
ImageRoot = "$(Get-InstallDir $Platform)\";
3142-
# When cross-compiling, bundle the second mimalloc redirect dll as a workaround for
3143-
# https://github.com/microsoft/mimalloc/issues/997
3144-
WORKAROUND_MIMALLOC_ISSUE_997 = if ($IsCrossCompiling) { "True" } else { "False" };
31453136
INCLUDE_SWIFT_DOCC = $INCLUDE_SWIFT_DOCC;
31463137
SWIFT_DOCC_BUILD = "$(Get-ProjectBinaryCache $HostPlatform DocC)\release";
31473138
SWIFT_DOCC_RENDER_ARTIFACT_ROOT = "${SourceCache}\swift-docc-render-artifact";

utils/update_checkout/update-checkout-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
"curl": "curl-8_9_1",
178178
"libxml2": "v2.11.5",
179179
"zlib": "v1.3.1",
180-
"mimalloc": "v3.0.1"
180+
"mimalloc": "v3.0.3"
181181
}
182182
},
183183
"release/6.2": {

0 commit comments

Comments
 (0)