@@ -681,6 +681,7 @@ enum Project {
681
681
ToolsSupportCore
682
682
LLBuild
683
683
ArgumentParser
684
+ SQLite
684
685
Driver
685
686
Crypto
686
687
Collections
@@ -2722,10 +2723,10 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
2722
2723
function Build-SQLite ([Hashtable ] $Platform ) {
2723
2724
Build-CMakeProject `
2724
2725
- Src $SourceCache \swift- toolchain- sqlite `
2725
- - Bin " $BinaryCache \$ ( $Platform.Triple ) \sqlite" `
2726
- - InstallTo " $BinaryCache \$ ( $Platform.Triple ) \usr" `
2726
+ - Bin (Get-ProjectBinaryCache $Platform SQLite) `
2727
2727
- Platform $Platform `
2728
2728
- UseMSVCCompilers C `
2729
+ - BuildTargets default `
2729
2730
- Defines @ {
2730
2731
BUILD_SHARED_LIBS = " NO" ;
2731
2732
}
@@ -2765,8 +2766,8 @@ function Build-Build([Hashtable] $Platform) {
2765
2766
SwiftDriver_DIR = (Get-ProjectCMakeModules $Platform Driver);
2766
2767
SwiftSystem_DIR = (Get-ProjectCMakeModules $Platform System);
2767
2768
TSC_DIR = (Get-ProjectCMakeModules $Platform ToolsSupportCore);
2768
- SQLite3_INCLUDE_DIR = " $BinaryCache \ $ ( $Platform .Triple ) \usr \include" ;
2769
- SQLite3_LIBRARY = " $BinaryCache \ $ ( $Platform.Triple ) \usr\lib \SQLite3.lib" ;
2769
+ SQLite3_INCLUDE_DIR = " $SourceCache \swift-toolchain-sqlite\Sources\CSQLite \include" ;
2770
+ SQLite3_LIBRARY = " $ ( Get-ProjectBinaryCache $Platform SQLite ) \SQLite3.lib" ;
2770
2771
} + $ArchSpecificOptions )
2771
2772
}
2772
2773
@@ -2800,8 +2801,8 @@ function Build-LLBuild([Hashtable] $Platform) {
2800
2801
- Defines @ {
2801
2802
BUILD_SHARED_LIBS = " YES" ;
2802
2803
LLBUILD_SUPPORT_BINDINGS = " Swift" ;
2803
- SQLite3_INCLUDE_DIR = " $BinaryCache \ $ ( $Platform .Triple ) \usr \include" ;
2804
- SQLite3_LIBRARY = " $BinaryCache \ $ ( $Platform.Triple ) \usr\lib \SQLite3.lib" ;
2804
+ SQLite3_INCLUDE_DIR = " $SourceCache \swift-toolchain-sqlite\Sources\CSQLite \include" ;
2805
+ SQLite3_LIBRARY = " $ ( Get-ProjectBinaryCache $Platform SQLite ) \SQLite3.lib" ;
2805
2806
}
2806
2807
}
2807
2808
@@ -2830,8 +2831,8 @@ function Test-LLBuild {
2830
2831
FILECHECK_EXECUTABLE = ([IO.Path ]::Combine((Get-ProjectBinaryCache $BuildPlatform BuildTools), " bin" , " FileCheck.exe" ));
2831
2832
LIT_EXECUTABLE = " $SourceCache \llvm-project\llvm\utils\lit\lit.py" ;
2832
2833
LLBUILD_SUPPORT_BINDINGS = " Swift" ;
2833
- SQLite3_INCLUDE_DIR = " $BinaryCache \ $ ( $Platform .Triple ) \usr \include" ;
2834
- SQLite3_LIBRARY = " $BinaryCache \ $ ( $Platform.Triple ) \usr\lib \SQLite3.lib" ;
2834
+ SQLite3_INCLUDE_DIR = " $SourceCache \swift-toolchain-sqlite\Sources\CSQLite \include" ;
2835
+ SQLite3_LIBRARY = " $ ( Get-ProjectBinaryCache $Platform SQLite ) \SQLite3.lib" ;
2835
2836
}
2836
2837
}
2837
2838
}
@@ -2865,8 +2866,8 @@ function Build-Driver([Hashtable] $Platform) {
2865
2866
TSC_DIR = (Get-ProjectCMakeModules $Platform ToolsSupportCore);
2866
2867
LLBuild_DIR = (Get-ProjectCMakeModules $Platform LLBuild);
2867
2868
ArgumentParser_DIR = (Get-ProjectCMakeModules $Platform ArgumentParser);
2868
- SQLite3_INCLUDE_DIR = " $BinaryCache \ $ ( $Platform .Triple ) \usr \include" ;
2869
- SQLite3_LIBRARY = " $BinaryCache \ $ ( $Platform.Triple ) \usr\lib \SQLite3.lib" ;
2869
+ SQLite3_INCLUDE_DIR = " $SourceCache \swift-toolchain-sqlite\Sources\CSQLite \include" ;
2870
+ SQLite3_LIBRARY = " $ ( Get-ProjectBinaryCache $Platform SQLite ) \SQLite3.lib" ;
2870
2871
SWIFT_DRIVER_BUILD_TOOLS = " YES" ;
2871
2872
LLVM_DIR = " $ ( Get-ProjectBinaryCache $Platform Compilers) \lib\cmake\llvm" ;
2872
2873
Clang_DIR = " $ ( Get-ProjectBinaryCache $Platform Compilers) \lib\cmake\clang" ;
@@ -2961,8 +2962,8 @@ function Build-PackageManager([Hashtable] $Platform) {
2961
2962
SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
2962
2963
SwiftCertificates_DIR = (Get-ProjectCMakeModules $Platform Certificates);
2963
2964
SwiftSyntax_DIR = (Get-ProjectCMakeModules $Platform Compilers);
2964
- SQLite3_INCLUDE_DIR = " $BinaryCache \ $ ( $Platform .Triple ) \usr \include" ;
2965
- SQLite3_LIBRARY = " $BinaryCache \ $ ( $Platform.Triple ) \usr\lib \SQLite3.lib" ;
2965
+ SQLite3_INCLUDE_DIR = " $SourceCache \swift-toolchain-sqlite\Sources\CSQLite \include" ;
2966
+ SQLite3_LIBRARY = " $ ( Get-ProjectBinaryCache $Platform SQLite ) \SQLite3.lib" ;
2966
2967
}
2967
2968
}
2968
2969
0 commit comments