diff --git a/utils/build.ps1 b/utils/build.ps1 index 0c52d641b34bf..f31cb027e2c65 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -3108,6 +3108,12 @@ function Build-FoundationMacros([Hashtable] $Platform) { } function Build-XCTest([Hashtable] $Platform) { + $SwiftFlags = if ($Platform.OS -eq [OS]::Windows) { + @(); + } else { + @("-I$(Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK)\usr\lib\swift"); + } + Build-CMakeProject ` -Src $SourceCache\swift-corelibs-xctest ` -Bin (Get-ProjectBinaryCache $Platform XCTest) ` @@ -3118,6 +3124,7 @@ function Build-XCTest([Hashtable] $Platform) { -Defines @{ BUILD_SHARED_LIBS = "YES"; CMAKE_INSTALL_BINDIR = $Platform.BinaryDir; + CMAKE_Swift_FLAGS = $SwiftFlags; ENABLE_TESTING = "NO"; XCTest_INSTALL_NESTED_SUBDIR = "YES"; } @@ -3164,6 +3171,12 @@ function Test-XCTest { } function Build-Testing([Hashtable] $Platform) { + $SwiftFlags = if ($Platform.OS -eq [OS]::Windows) { + @(); + } else { + @("-I$(Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK)\usr\lib\swift"); + } + Build-CMakeProject ` -Src $SourceCache\swift-testing ` -Bin (Get-ProjectBinaryCache $Platform Testing) ` @@ -3174,6 +3187,7 @@ function Build-Testing([Hashtable] $Platform) { -Defines @{ BUILD_SHARED_LIBS = "YES"; CMAKE_INSTALL_BINDIR = $Platform.BinaryDir; + CMAKE_Swift_FLAGS = $SwiftFlags; SwiftTesting_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapTestingMacros)\TestingMacros.dll"; SwiftTesting_INSTALL_NESTED_SUBDIR = "YES"; } @@ -3900,7 +3914,7 @@ function Build-Inspect([Hashtable] $Platform) { $InstallPath = "$(Get-PlatformRoot $Platform.OS)\Developer\Library\$(Get-ModuleTriple $Platform)" } - $SDKROOT = Get-SwiftSDK $Platform.OS + $SDKROOT = Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK Build-CMakeProject ` -Src $SourceCache\swift\tools\swift-inspect `