From 8891fba3d429cf0a718a91f2ef2703e04256ba9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Rodr=C3=ADguez?= Date: Tue, 30 Sep 2025 14:33:46 -0700 Subject: [PATCH] [test] Fix compatibility span calculation for unified builds In unified builds `swift_obj_root` is in a different place in the CMake build tree, so using it as the base for finding `lib` is not correct. Change the usage of `swift_obj_root/lib` for `config.swift_lib_dir` which should be correct in both unified and non-unified builds. --- test/lit.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lit.cfg b/test/lit.cfg index 344a12183c8a5..18a269a770cf2 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -2338,7 +2338,7 @@ if run_vendor == 'apple': "Compatibility span back deploy libraries not found at " f"{compatibility_span_back_deploy_path}. Falling back to local build...") compatibility_span_back_deploy_path = os.path.join( - swift_obj_root, 'lib', 'swift-6.2', xcrun_sdk_name) + config.swift_lib_dir, 'swift-6.2', xcrun_sdk_name) if not os.path.isdir(compatibility_span_back_deploy_path): lit_config.fatal( "Compatibility span back deploy libraries "