Skip to content

Commit c2a1081

Browse files
authored
Merge pull request swiftlang#80681 from compnerd/mimalloc
utils: remove mimalloc workaround
2 parents bc2efd6 + 96ccca6 commit c2a1081

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
@@ -1907,12 +1907,6 @@ function Build-mimalloc() {
19071907
Copy-Item -Path "$BinaryCache\$($Platform.Triple)\mimalloc\bin\$item" -Destination "$($Platform.ToolchainInstallRoot)\usr\bin\"
19081908
}
19091909

1910-
# When cross-compiling, bundle the second mimalloc redirect dll as a workaround for
1911-
# https://github.com/microsoft/mimalloc/issues/997
1912-
if ($IsCrossCompiling) {
1913-
Copy-Item -Path "$BinaryCache\$($Platform.Triple)\mimalloc\bin\mimalloc-redirect$HostSuffix.dll" -Destination "$($Platform.ToolchainInstallRoot)\usr\bin\mimalloc-redirect$BuildSuffix.dll"
1914-
}
1915-
19161910
# TODO: should we split this out into its own function?
19171911
$Tools = @(
19181912
"swift.exe",
@@ -3132,9 +3126,6 @@ function Build-Installer([Hashtable] $Platform) {
31323126
$Properties = @{
31333127
BundleFlavor = "offline";
31343128
ImageRoot = "$(Get-InstallDir $Platform)\";
3135-
# When cross-compiling, bundle the second mimalloc redirect dll as a workaround for
3136-
# https://github.com/microsoft/mimalloc/issues/997
3137-
WORKAROUND_MIMALLOC_ISSUE_997 = if ($IsCrossCompiling) { "True" } else { "False" };
31383129
INCLUDE_SWIFT_DOCC = $INCLUDE_SWIFT_DOCC;
31393130
SWIFT_DOCC_BUILD = "$(Get-ProjectBinaryCache $HostPlatform DocC)\release";
31403131
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)