Skip to content

Commit 3e72be9

Browse files
committed
build.ps1: use SDKOOT rather than recompute paths
Rather than re-compute the SDKROOT to form the path, use the environment variable that we setup for the `SDKROOT` to make SDKROOT relative paths.
1 parent 475bdd2 commit 3e72be9

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
@@ -1772,10 +1772,10 @@ function Build-SPMProject {
17721772
"--scratch-path", $Bin,
17731773
"--package-path", $Src,
17741774
"-c", $Configuration,
1775-
"-Xbuild-tools-swiftc", "-I$(Get-SwiftSDK $Platform.OS)\usr\lib\swift",
1776-
"-Xbuild-tools-swiftc", "-L$(Get-SwiftSDK $Platform.OS)\usr\lib\swift\windows",
1777-
"-Xcc", "-I$(Get-SwiftSDK $Platform.OS)\usr\lib\swift",
1778-
"-Xlinker", "-L$(Get-SwiftSDK $Platform.OS)\usr\lib\swift\windows"
1775+
"-Xbuild-tools-swiftc", "-I${env:SDKROOT}\usr\lib\swift",
1776+
"-Xbuild-tools-swiftc", "-L${env:SDKROOT}\usr\lib\swift\windows",
1777+
"-Xcc", "-I${env:SDKROOT}\usr\lib\swift",
1778+
"-Xlinker", "-L${env:SDKROOT}\usr\lib\swift\windows"
17791779
)
17801780
if ($DebugInfo) {
17811781
if ($Platform.OS -eq [OS]::Windows -and $SwiftDebugFormat -eq "codeview") {

0 commit comments

Comments
 (0)