Skip to content

Commit a26efc9

Browse files
authored
When the stdlib is built with LTO and a custom toolchain, point -lto_library to the toolchain's lib directory when running lit tests (#39587)
1 parent 127f2f5 commit a26efc9

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

test/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,12 @@ if(NOT SWIFT_INCLUDE_TOOLS)
145145
else()
146146
list(APPEND SWIFT_LIT_ARGS
147147
"--path=${SWIFT_NATIVE_LLVM_TOOLS_PATH}"
148+
"--param" "swift_native_llvm_tools_path=${SWIFT_NATIVE_LLVM_TOOLS_PATH}"
148149
"--path=${SWIFT_NATIVE_CLANG_TOOLS_PATH}"
149-
"--path=${SWIFT_NATIVE_SWIFT_TOOLS_PATH}")
150+
"--param" "swift_native_clang_tools_path=${SWIFT_NATIVE_CLANG_TOOLS_PATH}"
151+
"--path=${SWIFT_NATIVE_SWIFT_TOOLS_PATH}"
152+
"--param" "swift_native_swift_tools_path=${SWIFT_NATIVE_SWIFT_TOOLS_PATH}"
153+
)
150154
endif()
151155
if(SWIFT_BUILD_STDLIB)
152156
list(APPEND SWIFT_LIT_ARGS

test/lit.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,10 @@ if run_vendor == 'apple':
976976
"swiftSwiftOnoneSupport"]:
977977
swift_execution_tests_extra_flags += ' -Xlinker -l%s'% library
978978

979+
swift_native_clang_tools_path = lit_config.params.get('swift_native_clang_tools_path', None)
980+
if swift_native_clang_tools_path:
981+
swift_execution_tests_extra_flags += ' -Xlinker -lto_library -Xlinker %s/../lib/libLTO.dylib' % swift_native_clang_tools_path
982+
979983
xcrun_prefix = (
980984
"xcrun --toolchain %s --sdk %r" %
981985
(config.darwin_xcrun_toolchain, config.variant_sdk))

0 commit comments

Comments
 (0)