Skip to content

Commit 33b5868

Browse files
authored
Use full path to clang++ when expanding %clang in lit tests (#39180)
1 parent 9ea44d9 commit 33b5868

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

test/lit.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ config.swift_indent = inferSwiftBinary('swift-indent')
312312
config.swift_symbolgraph_extract = inferSwiftBinary('swift-symbolgraph-extract')
313313
config.swift_api_extract = inferSwiftBinary('swift-api-extract')
314314
config.clang = inferSwiftBinary('clang')
315+
config.clangxx = inferSwiftBinary('clang++')
315316
config.llvm_link = inferSwiftBinary('llvm-link')
316317
config.swift_llvm_opt = inferSwiftBinary('swift-llvm-opt')
317318
config.llvm_profdata = inferSwiftBinary('llvm-profdata')
@@ -1153,8 +1154,8 @@ if run_vendor == 'apple':
11531154
"-Xlinker -rpath -Xlinker /usr/lib/swift %s ")%
11541155
(xcrun_prefix, config.swiftc, target_options, config.swift_driver_test_options))
11551156
config.target_clang = (
1156-
"%s clang++ %s" %
1157-
(xcrun_prefix, config.target_cc_options))
1157+
"%s %s %s" %
1158+
(xcrun_prefix, config.clangxx, config.target_cc_options))
11581159

11591160
config.target_build_swift_dylib = (
11601161
"%s -parse-as-library -emit-library -o '\\1' "

0 commit comments

Comments
 (0)