Skip to content

Commit 8b11abe

Browse files
hjyamauchibnbarham
authored andcommitted
utils: unlock building swift-inspect
When building for ARM64, we can now build swift-inspect as we use CMake for the cross-compilation. This is a second attempt for #77810 (cherry picked from commit 5d95051)
1 parent 54fd5c2 commit 8b11abe

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

utils/build.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2644,8 +2644,7 @@ function Build-Inspect() {
26442644
-Bin (Get-HostProjectBinaryCache SwiftInspect) `
26452645
-InstallTo "$($HostArch.ToolchainInstallRoot)\usr" `
26462646
-Arch $HostArch `
2647-
-UseBuiltCompilers Swift `
2648-
-UseSwiftSwiftDriver `
2647+
-UseBuiltCompilers C,CXX,Swift `
26492648
-SwiftSDK $SDKRoot `
26502649
-Defines @{
26512650
CMAKE_Swift_FLAGS = @("-Xcc", "-I$SDKRoot\usr\include\swift\SwiftRemoteMirror");
@@ -2845,6 +2844,7 @@ if (-not $SkipBuild) {
28452844
Invoke-BuildStep Build-Format $HostArch
28462845
Invoke-BuildStep Build-IndexStoreDB $HostArch
28472846
Invoke-BuildStep Build-SourceKitLSP $HostArch
2847+
Invoke-BuildStep Build-Inspect $HostArch
28482848
}
28492849

28502850
Install-HostToolchain
@@ -2854,7 +2854,6 @@ if (-not $SkipBuild -and $Allocator -eq "mimalloc") {
28542854
}
28552855

28562856
if (-not $SkipBuild -and -not $IsCrossCompiling) {
2857-
Invoke-BuildStep Build-Inspect $HostArch
28582857
Invoke-BuildStep Build-DocC $HostArch
28592858
}
28602859

0 commit comments

Comments
 (0)