Skip to content

Commit 528da51

Browse files
committed
[bootstrap] Force SQLite to be picked from the SDK for llbuild
New cmake is looking for sqlite in the wrong place for some reason. We can fix it by explicitly passing -DSQLite3_INCLUDE_DIR=$(xcrun -sdk macosx -show-sdk-path)/usr/include in the cmake invocation. <rdar://problem/57437541>
1 parent 6522502 commit 528da51

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

Utilities/bootstrap

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,18 @@ def build_llbuild(args):
917917
cmake_cache_path = os.path.join(llbuild_build_dir, "CMakeCache.txt")
918918
if not os.path.isfile(cmake_cache_path) or not args.swiftc_path in open(cmake_cache_path).read():
919919
mkdir_p(llbuild_build_dir)
920-
cmd = ["cmake", "-G", "Ninja", "-DCMAKE_BUILD_TYPE:=Debug", "-DCMAKE_C_COMPILER:=clang", "-DCMAKE_CXX_COMPILER:=clang++", "-DLLBUILD_SUPPORT_BINDINGS:=Swift", "-DCMAKE_Swift_FLAGS=-sdk %s" % (g_default_sysroot) , "-DSWIFTC_EXECUTABLE:=%s" % (args.swiftc_path), llbuild_source_dir]
920+
cmd = [
921+
"cmake",
922+
"-G", "Ninja",
923+
"-DCMAKE_BUILD_TYPE:=Debug",
924+
"-DCMAKE_C_COMPILER:=clang",
925+
"-DCMAKE_CXX_COMPILER:=clang++",
926+
"-DLLBUILD_SUPPORT_BINDINGS:=Swift",
927+
"-DCMAKE_Swift_FLAGS=-sdk %s" % (g_default_sysroot),
928+
"-DCMAKE_Swift_COMPILER:=%s" % (args.swiftc_path),
929+
"-DSQLite3_INCLUDE_DIR=%s/usr/include" % (g_default_sysroot),
930+
llbuild_source_dir
931+
]
921932
subprocess.check_call(cmd, cwd=llbuild_build_dir)
922933

923934
# Build.

0 commit comments

Comments
 (0)