Skip to content

Commit 3990eaa

Browse files
committed
utils: specify linkage types for experimental SDK
1 parent ac4a362 commit 3990eaa

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

utils/build.ps1

Lines changed: 27 additions & 27 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) {
@@ -2452,7 +2452,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24522452

24532453
Build-CMakeProject `
24542454
-Src $SourceCache\swift\Runtimes\Core `
2455-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalRuntime) `
2455+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime) `
24562456
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
24572457
-Platform $Platform `
24582458
-UseBuiltCompilers C,CXX,Swift `
@@ -2481,7 +2481,7 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24812481

24822482
Build-CMakeProject `
24832483
-Src $SourceCache\swift\Runtimes\Overlay `
2484-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalOverlay) `
2484+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay) `
24852485
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
24862486
-Platform $Platform `
24872487
-UseBuiltCompilers C,CXX,Swift `
@@ -2495,12 +2495,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
24952495
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
24962496
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
24972497

2498-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2498+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
24992499
}
25002500

25012501
Build-CMakeProject `
25022502
-Src $SourceCache\swift\Runtimes\Supplemental\StringProcessing `
2503-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStringProcessing) `
2503+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticStringProcessing) `
25042504
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25052505
-Platform $Platform `
25062506
-UseBuiltCompilers C,Swift `
@@ -2514,12 +2514,12 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25142514
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25152515
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25162516

2517-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2517+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
25182518
}
25192519

25202520
Build-CMakeProject `
25212521
-Src $SourceCache\swift\Runtimes\Supplemental\Synchronization `
2522-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalSynchronization) `
2522+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticSynchronization) `
25232523
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25242524
-Platform $Platform `
25252525
-UseBuiltCompilers C,Swift `
@@ -2533,13 +2533,13 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25332533
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25342534
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25352535

2536-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2537-
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
2536+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2537+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay)\cmake\SwiftOverlay";
25382538
}
25392539

25402540
Build-CMakeProject `
25412541
-Src $SourceCache\swift\Runtimes\Supplemental\Distributed `
2542-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDistributed) `
2542+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDistributed) `
25432543
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25442544
-Platform $Platform `
25452545
-UseBuiltCompilers C,CXX,Swift `
@@ -2548,19 +2548,19 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25482548
-Defines @{
25492549
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25502550
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
2551-
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\include");
2551+
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\include");
25522552
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
25532553
CMAKE_Swift_COMPILER_WORKS = "YES";
25542554
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25552555
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25562556

2557-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2558-
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
2557+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2558+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay)\cmake\SwiftOverlay";
25592559
}
25602560

25612561
Build-CMakeProject `
25622562
-Src $SourceCache\swift\Runtimes\Supplemental\Observation `
2563-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalObservation) `
2563+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticObservation) `
25642564
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
25652565
-Platform $Platform `
25662566
-UseBuiltCompilers CXX,Swift `
@@ -2569,14 +2569,14 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
25692569
-Defines @{
25702570
BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
25712571
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
2572-
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\include");
2572+
CMAKE_CXX_FLAGS = @("-I$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\include");
25732573
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
25742574
CMAKE_Swift_COMPILER_WORKS = "YES";
25752575
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
25762576
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
25772577

2578-
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2579-
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
2578+
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticRuntime)\cmake\SwiftCore";
2579+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalStaticOverlay)\cmake\SwiftOverlay";
25802580
}
25812581
}
25822582
}
@@ -2661,7 +2661,7 @@ function Build-Foundation {
26612661
)
26622662

26632663
$FoundationBinaryCache = if ($Static) {
2664-
Get-ProjectBinaryCache $Platform ExperimentalFoundation
2664+
Get-ProjectBinaryCache $Platform ExperimentalStaticFoundation
26652665
} else {
26662666
Get-ProjectBinaryCache $Platform DynamicFoundation
26672667
}
@@ -2685,7 +2685,7 @@ function Build-Foundation {
26852685
}
26862686

26872687
$DispatchCMakeModules = if ($Static) {
2688-
Get-ProjectCMakeModules $Platform ExperimentalDispatch
2688+
Get-ProjectCMakeModules $Platform ExperimentalStaticDispatch
26892689
} else {
26902690
Get-ProjectCMakeModules $Platform Dispatch
26912691
}
@@ -2907,7 +2907,7 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
29072907
$env:Path = "$(Get-CMarkBinaryCache $Platform)\src;$(Get-PinnedToolchainRuntime);${env:Path}"
29082908
Build-CMakeProject `
29092909
-Src $SourceCache\swift-corelibs-libdispatch `
2910-
-Bin (Get-ProjectBinaryCache $Platform ExperimentalDispatch) `
2910+
-Bin (Get-ProjectBinaryCache $Platform ExperimentalStaticDispatch) `
29112911
-InstallTo "$(Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental")\usr" `
29122912
-Platform $Platform `
29132913
-UseBuiltCompilers C,CXX,Swift `

0 commit comments

Comments
 (0)