Skip to content

Commit 6522502

Browse files
committed
[bootstrap] Fix desktop bootstrapping
The recent CMake changes require explicitly passing the SDK when building llbuild. This is essentially a small bug in Swift CMake support. <rdar://problem/57430915>
1 parent d923aa4 commit 6522502

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Utilities/bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ 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", "-DSWIFTC_EXECUTABLE:=%s" % (args.swiftc_path), llbuild_source_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]
921921
subprocess.check_call(cmd, cwd=llbuild_build_dir)
922922

923923
# Build.

0 commit comments

Comments
 (0)