Skip to content

Commit 3f9c61b

Browse files
authored
Fix clang linker driver issue in the bootstrap script (swiftlang#7633)
llbuild's `utils/adjust-times` executable can't be linked on Ubuntu Jammy with a plain `clang` invocation, which doesn't link C++ standard library. Replacing that `clang` invocation with `clang++` fixes the issue.
1 parent 0d557ec commit 3f9c61b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Utilities/bootstrap

+2-1
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ def parse_build_args(args):
225225

226226
args.swiftc_path = get_swiftc_path(args)
227227
args.clang_path = get_tool_path(args, "clang")
228+
args.clangxx_path = get_tool_path(args, "clang++")
228229
if not args.skip_cmake_bootstrap:
229230
args.cmake_path = get_tool_path(args, "cmake")
230231
args.ninja_path = get_tool_path(args, "ninja")
@@ -550,7 +551,7 @@ def build_llbuild(args):
550551

551552
flags = [
552553
"-DCMAKE_C_COMPILER:=%s" % (args.clang_path),
553-
"-DCMAKE_CXX_COMPILER:=%s" % (args.clang_path),
554+
"-DCMAKE_CXX_COMPILER:=%s" % (args.clangxx_path),
554555
"-DCMAKE_AR:PATH=%s" % (args.ar_path),
555556
"-DCMAKE_RANLIB:PATH=%s" % (args.ranlib_path),
556557
"-DLLBUILD_SUPPORT_BINDINGS:=Swift",

0 commit comments

Comments
 (0)