diff --git a/utils/build.ps1 b/utils/build.ps1 index 45793f83e7516..afb2c65e19dbc 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -3169,16 +3169,18 @@ function Build-ExperimentalSDK([Hashtable] $Platform) { Invoke-BuildStep Build-ExperimentalRuntime $Platform Invoke-BuildStep Build-ExperimentalRuntime $Platform -Static + $SDKROOT = Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental" + Invoke-IsolatingEnvVars { $env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-PinnedToolchainRuntime);${env:Path}" Build-CMakeProject ` -Src $SourceCache\swift-corelibs-libdispatch ` -Bin (Get-ProjectBinaryCache $Platform ExperimentalDynamicDispatch) ` - -InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" ` + -InstallTo "${SDKROOT}\usr" ` -Platform $Platform ` -UseBuiltCompilers C,CXX,Swift ` - -SwiftSDK (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental") ` + -SwiftSDK "${SDKROOT}" ` -Defines @{ BUILD_SHARED_LIBS = "YES"; CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES"; @@ -3190,10 +3192,10 @@ function Build-ExperimentalSDK([Hashtable] $Platform) { Build-CMakeProject ` -Src $SourceCache\swift-corelibs-libdispatch ` -Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDispatch) ` - -InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" ` + -InstallTo "${SDKROOT}\usr" ` -Platform $Platform ` -UseBuiltCompilers C,CXX,Swift ` - -SwiftSDK (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental") ` + -SwiftSDK "${SDKROOT}" ` -Defines @{ BUILD_SHARED_LIBS = "NO"; CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir"); @@ -3206,10 +3208,10 @@ function Build-ExperimentalSDK([Hashtable] $Platform) { Build-CMakeProject ` -Src $SourceCache\swift-corelibs-foundation ` -Bin (Get-ProjectBinaryCache $Platform ExperimentalDynamicFoundation) ` - -InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" ` + -InstallTo "${SDKROOT}\usr" ` -Platform $Platform ` -UseBuiltCompilers ASM,C,CXX,Swift ` - -SwiftSDK (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental") ` + -SwiftSDK "${SDKROOT}" ` -Defines @{ BUILD_SHARED_LIBS = "YES"; CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES"; @@ -3237,10 +3239,10 @@ function Build-ExperimentalSDK([Hashtable] $Platform) { Build-CMakeProject ` -Src $SourceCache\swift-corelibs-foundation ` -Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticFoundation) ` - -InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" ` + -InstallTo "${SDKROOT}\usr" ` -Platform $Platform ` -UseBuiltCompilers ASM,C,CXX,Swift ` - -SwiftSDK (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental") ` + -SwiftSDK ${SDKROOT} ` -Defines @{ BUILD_SHARED_LIBS = "NO"; CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES"; @@ -3986,14 +3988,16 @@ if (-not $SkipBuild) { foreach ($Build in $WindowsSDKBuilds) { Invoke-BuildStep Build-ExperimentalSDK $Build + $SDKROOT = Get-SwiftSDK Windows -Identifier WindowsExperimental + Get-ChildItem "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object { Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory" - Move-Item $_.FullName "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" | Out-Null + Move-Item $_.FullName "$SDKROOT\usr\lib\swift\windows\$($Build.Architecture.LLVMName)\" | Out-Null } Get-ChildItem "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift_static\windows" -Filter "*.lib" -File -ErrorAction Ignore | ForEach-Object { Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory" - Move-Item $_.FullName "$(Get-SwiftSDK Windows -Identifier WindowsExperimental)\usr\lib\swift_static\windows\$($Build.Architecture.LLVMName)\" | Out-Null + Move-Item $_.FullName "$SDKROOT\usr\lib\swift_static\windows\$($Build.Architecture.LLVMName)\" | Out-Null } # FIXME(compnerd) how do we select which SDK is meant to be re-distributed? @@ -4029,14 +4033,16 @@ if (-not $SkipBuild) { foreach ($Build in $AndroidSDKBuilds) { Invoke-BuildStep Build-ExperimentalSDK $Build + $SDKROOT = Get-SwiftSDK Android -Identifier AndroidExperimental + Get-ChildItem "$(Get-SwiftSDK Android -Identifier AndroidExperimental)\usr\lib\swift\android" -File | Where-Object { $_.Name -match ".a$|.so$" } | ForEach-Object { Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory" - Move-Item $_.FullName "$(Get-SwiftSDK Android -Identifier AndroidExperimental)\usr\lib\swift\android\$($Build.Architecture.LLVMName)\" | Out-Null + Move-Item $_.FullName "$SDKROOT\usr\lib\swift\android\$($Build.Architecture.LLVMName)\" | Out-Null } Get-ChildItem "$(Get-SwiftSDK Android -Identifier AndroidExperimental)\usr\lib\swift_static\android" -File | Where-Object { $_.Name -match ".a$|.so$" } | ForEach-Object { Write-Host -BackgroundColor DarkRed -ForegroundColor White "$($_.FullName) is not nested in an architecture directory" - Move-Item $_.FullName "$(Get-SwiftSDK Android -Identifier AndroidExperimental)\usr\lib\swift_static\android\$($Build.Architecture.LLVMName)\" | Out-Null + Move-Item $_.FullName "$SDKROOT\usr\lib\swift_static\android\$($Build.Architecture.LLVMName)\" | Out-Null } }