Skip to content

Commit f3f7a96

Browse files
Steelskincompnerd
authored andcommitted
mimalloc: Remove workaround for mimalloc
This is no longer required with mimalloc 3.0.3.
1 parent 29f5078 commit f3f7a96

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3777,12 +3777,6 @@ jobs:
37773777
-Destination "$ToolchainBin"
37783778
Copy-Item -Path "${{ github.workspace }}\SourceCache\mimalloc\out\msvc-$HostMSArch\Release\mimalloc-redirect$HostSuffix.dll" `
37793779
-Destination "$ToolchainBin"
3780-
# When cross-compiling, bundle the second mimalloc redirect dll as a workaround for
3781-
# https://github.com/microsoft/mimalloc/issues/997
3782-
if ("${{ inputs.build_arch }}" -ne "${{ matrix.arch }}") {
3783-
Copy-Item -Path "${{ github.workspace }}\SourceCache\mimalloc\out\msvc-$HostMSArch\Release\mimalloc-redirect$HostSuffix.dll" `
3784-
-Destination "$ToolchainBin/mimalloc-redirect$BuildSuffix.dll"
3785-
}
37863780
$MimallocExecutables = @("swift.exe",
37873781
"swiftc.exe",
37883782
"swift-driver.exe",
@@ -3804,16 +3798,14 @@ jobs:
38043798
- name: Package Build Tools
38053799
run: |
38063800
# When cross-compiling, bundle the second mimalloc redirect dll as a workaround for
3807-
# https://github.com/microsoft/mimalloc/issues/997
3808-
$WORKAROUND_MIMALLOC_ISSUE_997 = if ("${{ inputs.build_arch }}" -ne "${{ matrix.arch }}") { "true" } else { "false" }
38093801
msbuild -nologo -restore -maxCpuCount `
38103802
-p:BaseOutputPath=${{ github.workspace }}\BinaryCache\installer\ `
38113803
-p:Configuration=Release `
38123804
-p:SignOutput=${{ inputs.signed }} `
38133805
-p:CERTIFICATE=${env:CERTIFICATE} `
38143806
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
38153807
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
3816-
-p:WORKAROUND_MIMALLOC_ISSUE_997=$WORKAROUND_MIMALLOC_ISSUE_997 `
3808+
-p:WORKAROUND_MIMALLOC_ISSUE_997=false `
38173809
-p:ProductVersion=${{ inputs.swift_version }} `
38183810
-p:ProductArchitecture=${{ matrix.arch }} `
38193811
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bld/bld.wixproj

0 commit comments

Comments
 (0)