Skip to content

Commit 62f128f

Browse files
authored
Merge pull request swiftlang#79271 from jeffdav/build-ps1-whitespace-excision
util: Excise trailing whitespace in build.ps1.
2 parents 8733205 + ff702de commit 62f128f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

utils/build.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ function Invoke-VsDevShell($Arch) {
639639
if ($ToBatch) {
640640
Write-Output "call `"$VSInstallRoot\Common7\Tools\VsDevCmd.bat`" $DevCmdArguments"
641641
} else {
642-
# This dll path is valid for VS2019 and VS2022, but it was under a vsdevcmd subfolder in VS2017
642+
# This dll path is valid for VS2019 and VS2022, but it was under a vsdevcmd subfolder in VS2017
643643
Import-Module "$VSInstallRoot\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
644644
Enter-VsDevShell -VsInstallPath $VSInstallRoot -SkipAutomaticLocation -DevCmdArguments $DevCmdArguments
645645

@@ -1451,7 +1451,7 @@ function Build-WiXProject() {
14511451
$ProductVersionArg = $ProductVersion
14521452
if (-not $Bundle) {
14531453
# WiX v4 will accept a semantic version string for Bundles,
1454-
# but Packages still require a purely numerical version number,
1454+
# but Packages still require a purely numerical version number,
14551455
# so trim any semantic versioning suffixes
14561456
$ProductVersionArg = [regex]::Replace($ProductVersion, "[-+].*", "")
14571457
}
@@ -1796,7 +1796,7 @@ function Build-Sanitizers([Platform]$Platform, $Arch) {
17961796
LLVM_ENABLE_PER_TARGET_RUNTIME_DIR = "YES";
17971797
COMPILER_RT_DEFAULT_TARGET_ONLY = "YES";
17981798
})
1799-
1799+
18001800
Build-CMakeProject `
18011801
-Src $SourceCache\llvm-project\compiler-rt `
18021802
-Bin "$(Get-TargetProjectBinaryCache $Arch ClangRuntime)" `
@@ -2736,7 +2736,7 @@ function Test-Format {
27362736
"-Xswiftc", "-I$(Get-HostProjectBinaryCache Format)\swift",
27372737
"-Xlinker", "-L$(Get-HostProjectBinaryCache Format)\lib"
27382738
)
2739-
2739+
27402740
Isolate-EnvVars {
27412741
$env:SWIFTFORMAT_BUILD_ONLY_TESTS=1
27422742
# Testing swift-format is faster in serial mode than in parallel mode, probably because parallel test execution

0 commit comments

Comments
 (0)