Skip to content

Commit cef9748

Browse files
authored
Merge pull request #75718 from rintaro/windows-install-install
[Windows] Avoid 'install' twice
2 parents 0f049e6 + 65cd1de commit cef9748

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

utils/build.ps1

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,7 +1602,7 @@ function Build-Dispatch([Platform]$Platform, $Arch, [switch]$Test = $false) {
16021602
$Targets = @("default", "ExperimentalTest")
16031603
$InstallPath = ""
16041604
} else {
1605-
$Targets = @("default", "install")
1605+
$Targets = @("default")
16061606
$InstallPath = "$($Arch.SDKInstallRoot)\usr"
16071607
}
16081608

@@ -1652,7 +1652,7 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
16521652

16531653
Isolate-EnvVars {
16541654
$TestingDefines = @{ ENABLE_TESTING = "NO" }
1655-
$Targets = @("default", "install")
1655+
$Targets = @("default")
16561656
$InstallPath = "$($Arch.SDKInstallRoot)\usr"
16571657

16581658
if ($Platform -eq "Android") {
@@ -1714,7 +1714,7 @@ function Build-XCTest([Platform]$Platform, $Arch, [switch]$Test = $false) {
17141714
$env:Path = "$XCTestBinaryCache;$FoundationBinaryCache\bin;$DispatchBinaryCache;$(Get-TargetProjectBinaryCache $Arch Runtime)\bin;$env:Path;$UnixToolsBinDir"
17151715
} else {
17161716
$TestingDefines = @{ ENABLE_TESTING = "NO" }
1717-
$Targets = @("default", "install")
1717+
$Targets = @("default")
17181718
$InstallPath = "$($Arch.XCTestInstallRoot)\usr"
17191719
}
17201720

@@ -1914,15 +1914,17 @@ function Build-LLBuild($Arch, [switch]$Test = $false) {
19141914
$env:Path = "$env:Path;$UnixToolsBinDir"
19151915
$env:AR = ([IO.Path]::Combine((Get-HostProjectBinaryCache Compilers), "bin", "llvm-ar.exe"))
19161916
$env:CLANG = ([IO.Path]::Combine((Get-HostProjectBinaryCache Compilers), "bin", "clang.exe"))
1917+
$InstallPath = ""
19171918
} else {
1918-
$Targets = @("default", "install")
1919+
$Targets = @("default")
19191920
$TestingDefines = @{}
1921+
$InstallPath = "$($Arch.ToolchainInstallRoot)\usr"
19201922
}
19211923

19221924
Build-CMakeProject `
19231925
-Src $SourceCache\llbuild `
19241926
-Bin (Get-HostProjectBinaryCache LLBuild) `
1925-
-InstallTo "$($Arch.ToolchainInstallRoot)\usr" `
1927+
-InstallTo $InstallPath `
19261928
-Arch $Arch `
19271929
-Platform Windows `
19281930
-UseMSVCCompilers CXX `

0 commit comments

Comments
 (0)