Skip to content

Fix order of building mimalloc with -IncludeNoAsserts #83867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

Fix order of building mimalloc with -IncludeNoAsserts #83867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,15 +2222,24 @@ function Build-mimalloc() {
Invoke-Program $msbuild "$SourceCache\mimalloc\ide\vs2022\mimalloc-override-dll.vcxproj" @MSBuildArgs "-p:IntDir=$BinaryCache\$($Platform.Triple)\mimalloc\mimalloc-override-dll\"

$HostSuffix = if ($Platform -eq $KnownPlatforms["WindowsX64"]) { "" } else { "-arm64" }
$BuildSuffix = if ($BuildPlatform -eq $KnownPlatforms["WindowsX64"]) { "" } else { "-arm64" }

foreach ($item in "mimalloc.dll", "mimalloc-redirect$HostSuffix.dll") {
Copy-Item `
-Path "$BinaryCache\$($Platform.Triple)\mimalloc\bin\$item" `
-Destination "$($Platform.ToolchainInstallRoot)\usr\bin\"
}
}

function Patch-mimalloc() {
[CmdletBinding(PositionalBinding = $false)]
param
(
[Parameter(Position = 0, Mandatory = $true)]
[hashtable]$Platform
)

$BuildSuffix = if ($BuildPlatform -eq $KnownPlatforms["WindowsX64"]) { "" } else { "-arm64" }

# TODO: should we split this out into its own function?
$Tools = @(
"swift.exe",
"swiftc.exe",
Expand Down Expand Up @@ -4030,6 +4039,10 @@ if (-not $SkipBuild -and -not $IsCrossCompiling) {
Invoke-BuildStep Build-DocC $HostPlatform
}

if (-not $SkipBuild) {
Invoke-BuildStep Patch-mimalloc $HostPlatform
}

if (-not $SkipPackaging) {
Invoke-BuildStep Build-Installer $HostPlatform
}
Expand Down