Skip to content

Commit e9a8ebb

Browse files
stevapplecompnerd
authored andcommitted
[build.ps1] fix misuse of varibles in Extract-Toolchain
1 parent a67f82b commit e9a8ebb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

utils/build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -700,16 +700,16 @@ function Fetch-Dependencies {
700700
$installerWriteTime = (Get-Item $source).LastWriteTime
701701
$extractedWriteTime = (Get-Item $destination).LastWriteTime
702702
if ($installerWriteTime -le $extractedWriteTime) {
703-
Write-Output "'$ToolchainName' is already extracted and up to date."
703+
Write-Output "'$InstallerExeName' is already extracted and up to date."
704704
return
705705
}
706706
}
707707

708-
Write-Output "Extracting '$ToolchainName' ..."
708+
Write-Output "Extracting '$InstallerExeName' ..."
709709

710710
# The new runtime MSI is built to expand files into the immediate directory. So, setup the installation location.
711711
New-Item -ItemType Directory -ErrorAction Ignore $BinaryCache\toolchains\$PinnedToolchain\LocalApp\Programs\Swift\Runtimes\$(Get-PinnedToolchainVersion)\usr\bin | Out-Null
712-
Invoke-Program $BinaryCache\WiX-$WiXVersion\tools\net6.0\any\wix.exe -- burn extract $BinaryCache\$ToolchainName.exe -out $BinaryCache\toolchains\ -outba $BinaryCache\toolchains\
712+
Invoke-Program $BinaryCache\WiX-$WiXVersion\tools\net6.0\any\wix.exe -- burn extract $BinaryCache\$InstallerExeName -out $BinaryCache\toolchains\ -outba $BinaryCache\toolchains\
713713
Get-ChildItem "$BinaryCache\toolchains\WixAttachedContainer" -Filter "*.msi" | ForEach-Object {
714714
$LogFile = [System.IO.Path]::ChangeExtension($_.Name, "log")
715715
$TARGETDIR = if ($_.Name -eq "rtl.msi") { "$BinaryCache\toolchains\$ToolchainName\LocalApp\Programs\Swift\Runtimes\$(Get-PinnedToolchainVersion)\usr\bin" } else { "$BinaryCache\toolchains\$ToolchainName" }

0 commit comments

Comments
 (0)