Skip to content

Commit 24c13e0

Browse files
compnerdcompnerd
committed
utils: specify linkage types for experimental SDK
1 parent e6c4bc9 commit 24c13e0

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎utils/build.ps1

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

721721
function Get-ProjectBinaryCache([Hashtable] $Platform, [Project] $Project) {
@@ -2470,7 +2470,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24702470

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

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

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

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

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

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

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

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

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

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

2590-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2591-
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
2590+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2591+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay)\cmake\SwiftOverlay";
25922592
}
25932593

25942594
Build-CMakeProject `
25952595
-Src $SourceCache\swift\Runtimes\Supplemental\Differentiation `
2596-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDifferentiation) `
2596+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDifferentiation) `
25972597
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25982598
-Platform $Platform `
25992599
-UseBuiltCompilers C,CXX,Swift `
@@ -2606,8 +2606,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
26062606
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
26072607
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
26082608

2609-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2610-
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
2609+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2610+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay)\cmake\SwiftOverlay";
26112611
}
26122612
}
26132613
}
@@ -2692,7 +2692,7 @@ function Build-Foundation {
26922692
)
26932693

26942694
$FoundationBinaryCache = if ($Static) {
2695-
Get-ProjectBinaryCache $Platform ExperimentalFoundation
2695+
Get-ProjectBinaryCache $Platform ExperimentalStaticFoundation
26962696
} else {
26972697
Get-ProjectBinaryCache $Platform DynamicFoundation
26982698
}
@@ -2716,7 +2716,7 @@ function Build-Foundation {
27162716
}
27172717

27182718
$DispatchCMakeModules = if ($Static) {
2719-
Get-ProjectCMakeModules $Platform ExperimentalDispatch
2719+
Get-ProjectCMakeModules $Platform ExperimentalStaticDispatch
27202720
} else {
27212721
Get-ProjectCMakeModules $Platform Dispatch
27222722
}
@@ -2937,7 +2937,7 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
29372937
$env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-PinnedToolchainRuntime);${env:Path}"
29382938
Build-CMakeProject `
29392939
-Src $SourceCache\swift-corelibs-libdispatch `
2940-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDispatch) `
2940+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDispatch) `
29412941
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
29422942
-Platform $Platform `
29432943
-UseBuiltCompilers C,CXX,Swift `

0 commit comments

Comments
 (0)