Skip to content

Commit 8fe9b9d

Browse files
committed
utils: specify linkage types for experimental SDK
1 parent d84656f commit 8fe9b9d

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

utils/build.ps1

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -707,14 +707,14 @@ enum Project {
707707
ClangBuiltins
708708
ClangRuntime
709709
SwiftInspect
710-
ExperimentalRuntime
711-
ExperimentalOverlay
712-
ExperimentalStringProcessing
713-
ExperimentalSynchronization
714-
ExperimentalDistributed
715-
ExperimentalObservation
716-
ExperimentalDispatch
717-
ExperimentalFoundation
710+
ExperimentalStaticRuntime
711+
ExperimentalStaticOverlay
712+
ExperimentalStaticStringProcessing
713+
ExperimentalStaticSynchronization
714+
ExperimentalStaticDistributed
715+
ExperimentalStaticObservation
716+
ExperimentalStaticDispatch
717+
ExperimentalStaticFoundation
718718
}
719719

720720
function Get-ProjectBinaryCache([Hashtable] $Platform, [Project] $Project) {
@@ -2469,7 +2469,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24692469

24702470
Build-CMakeProject `
24712471
-Src $SourceCache\swift\Runtimes\Core `
2472-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalRuntime) `
2472+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime) `
24732473
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
24742474
-Platform $Platform `
24752475
-UseBuiltCompilers C,CXX,Swift `
@@ -2497,7 +2497,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24972497

24982498
Build-CMakeProject `
24992499
-Src $SourceCache\swift\Runtimes\Overlay `
2500-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalOverlay) `
2500+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay) `
25012501
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25022502
-Platform $Platform `
25032503
-UseBuiltCompilers C,CXX,Swift `
@@ -2510,12 +2510,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25102510
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25112511
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25122512

2513-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2513+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
25142514
}
25152515

25162516
Build-CMakeProject `
25172517
-Src $SourceCache\swift\Runtimes\Supplemental\StringProcessing `
2518-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStringProcessing) `
2518+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticStringProcessing) `
25192519
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25202520
-Platform $Platform `
25212521
-UseBuiltCompilers C,Swift `
@@ -2528,12 +2528,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25282528
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25292529
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25302530

2531-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2531+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
25322532
}
25332533

25342534
Build-CMakeProject `
25352535
-Src $SourceCache\swift\Runtimes\Supplemental\Synchronization `
2536-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalSynchronization) `
2536+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticSynchronization) `
25372537
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25382538
-Platform $Platform `
25392539
-UseBuiltCompilers C,Swift `
@@ -2546,47 +2546,47 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25462546
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25472547
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25482548

2549-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2550-
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
2549+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2550+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay)\cmake\SwiftOverlay";
25512551
}
25522552

25532553
Build-CMakeProject `
25542554
-Src $SourceCache\swift\Runtimes\Supplemental\Distributed `
2555-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDistributed) `
2555+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDistributed) `
25562556
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25572557
-Platform $Platform `
25582558
-UseBuiltCompilers C,CXX,Swift `
25592559
-UseGNUDriver `
25602560
-Defines @{
25612561
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25622562
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
2563-
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\include");
2563+
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\include");
25642564
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
25652565
CMAKE_Swift_COMPILER_WORKS = "YES";
25662566
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25672567
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25682568

2569-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2570-
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
2569+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2570+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay)\cmake\SwiftOverlay";
25712571
}
25722572

25732573
Build-CMakeProject `
25742574
-Src $SourceCache\swift\Runtimes\Supplemental\Observation `
2575-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalObservation) `
2575+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticObservation) `
25762576
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25772577
-Platform $Platform `
25782578
-UseBuiltCompilers CXX,Swift `
25792579
-UseGNUDriver `
25802580
-Defines @{
25812581
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25822582
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
2583-
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\include");
2583+
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\include");
25842584
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
25852585
CMAKE_Swift_COMPILER_WORKS = "YES";
25862586
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25872587
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25882588

2589-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2589+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
25902590
}
25912591
}
25922592
}
@@ -2671,7 +2671,7 @@ function Build-Foundation {
26712671
)
26722672

26732673
$FoundationBinaryCache = if ($Static) {
2674-
Get-ProjectBinaryCache $Platform ExperimentalFoundation
2674+
Get-ProjectBinaryCache $Platform ExperimentalStaticFoundation
26752675
} else {
26762676
Get-ProjectBinaryCache $Platform DynamicFoundation
26772677
}
@@ -2695,7 +2695,7 @@ function Build-Foundation {
26952695
}
26962696

26972697
$DispatchCMakeModules = if ($Static) {
2698-
Get-ProjectCMakeModules $Platform ExperimentalDispatch
2698+
Get-ProjectCMakeModules $Platform ExperimentalStaticDispatch
26992699
} else {
27002700
Get-ProjectCMakeModules $Platform Dispatch
27012701
}
@@ -2916,7 +2916,7 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
29162916
$env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-PinnedToolchainRuntime);${env:Path}"
29172917
Build-CMakeProject `
29182918
-Src $SourceCache\swift-corelibs-libdispatch `
2919-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDispatch) `
2919+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDispatch) `
29202920
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
29212921
-Platform $Platform `
29222922
-UseBuiltCompilers C,CXX,Swift `

0 commit comments

Comments
 (0)