Skip to content

Commit 7e6b7c8

Browse files
authored
build: avoid installing SQLite3 (#82322)
We build SQLite statically. We do not need to stage this into an install location to use. Directly pass along the paths modified as a build product.
1 parent 4ac3f7c commit 7e6b7c8

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

utils/build.ps1

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ enum Project {
681681
ToolsSupportCore
682682
LLBuild
683683
ArgumentParser
684+
SQLite
684685
Driver
685686
Crypto
686687
Collections
@@ -2722,10 +2723,10 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
27222723
function Build-SQLite([Hashtable] $Platform) {
27232724
Build-CMakeProject `
27242725
-Src $SourceCache\swift-toolchain-sqlite `
2725-
-Bin "$BinaryCache\$($Platform.Triple)\sqlite" `
2726-
-InstallTo "$BinaryCache\$($Platform.Triple)\usr" `
2726+
-Bin (Get-ProjectBinaryCache $Platform SQLite) `
27272727
-Platform $Platform `
27282728
-UseMSVCCompilers C `
2729+
-BuildTargets default `
27292730
-Defines @{
27302731
BUILD_SHARED_LIBS = "NO";
27312732
}
@@ -2765,8 +2766,8 @@ function Build-Build([Hashtable] $Platform) {
27652766
SwiftDriver_DIR = (Get-ProjectCMakeModules $Platform Driver);
27662767
SwiftSystem_DIR = (Get-ProjectCMakeModules $Platform System);
27672768
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";
27702771
} + $ArchSpecificOptions)
27712772
}
27722773

@@ -2800,8 +2801,8 @@ function Build-LLBuild([Hashtable] $Platform) {
28002801
-Defines @{
28012802
BUILD_SHARED_LIBS = "YES";
28022803
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";
28052806
}
28062807
}
28072808

@@ -2830,8 +2831,8 @@ function Test-LLBuild {
28302831
FILECHECK_EXECUTABLE = ([IO.Path]::Combine((Get-ProjectBinaryCache $BuildPlatform BuildTools), "bin", "FileCheck.exe"));
28312832
LIT_EXECUTABLE = "$SourceCache\llvm-project\llvm\utils\lit\lit.py";
28322833
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";
28352836
}
28362837
}
28372838
}
@@ -2865,8 +2866,8 @@ function Build-Driver([Hashtable] $Platform) {
28652866
TSC_DIR = (Get-ProjectCMakeModules $Platform ToolsSupportCore);
28662867
LLBuild_DIR = (Get-ProjectCMakeModules $Platform LLBuild);
28672868
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";
28702871
SWIFT_DRIVER_BUILD_TOOLS = "YES";
28712872
LLVM_DIR = "$(Get-ProjectBinaryCache $Platform Compilers)\lib\cmake\llvm";
28722873
Clang_DIR = "$(Get-ProjectBinaryCache $Platform Compilers)\lib\cmake\clang";
@@ -2961,8 +2962,8 @@ function Build-PackageManager([Hashtable] $Platform) {
29612962
SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
29622963
SwiftCertificates_DIR = (Get-ProjectCMakeModules $Platform Certificates);
29632964
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";
29662967
}
29672968
}
29682969

0 commit comments

Comments
 (0)