Skip to content

Commit f019ba3

Browse files
committed
Ensure availability of all required libdispatch artifacts
Make sure all libdispatch build artifacts are availlable before adding the libdispatch lit test feature.
1 parent d4619ae commit f019ba3

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

test/lit.cfg

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -912,14 +912,19 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
912912
config.target_runtime = "native"
913913
config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
914914

915-
config.libdispatch_build_dir = make_path(config.swift_obj_root, os.pardir,
915+
libdispatch_build_dir = make_path(config.swift_obj_root, os.pardir,
916916
'libdispatch%s' % config.variant_suffix, 'src')
917-
if os.path.exists(config.libdispatch_build_dir):
917+
libdispatch_build_artifacts = [
918+
make_path(libdispatch_build_dir, 'libdispatch.so'),
919+
make_path(libdispatch_build_dir, 'libswiftDispatch.so'),
920+
make_path(libdispatch_build_dir, 'swift', 'Dispatch.swiftmodule')]
921+
if (all(os.path.exists(p) for p in libdispatch_build_artifacts)):
918922
config.available_features.add('libdispatch')
923+
config.libdispatch_build_dir = libdispatch_build_dir
919924
source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
920-
swift_module_dir = make_path(config.libdispatch_build_dir, 'swift')
925+
swift_module_dir = make_path(libdispatch_build_dir, 'swift')
921926
config.import_libdispatch = ('-I %s -I %s -L %s'
922-
% (source_dir, swift_module_dir, config.libdispatch_build_dir))
927+
% (source_dir, swift_module_dir, libdispatch_build_dir))
923928

924929
config.target_build_swift = (
925930
'%s -target %s %s %s %s %s %s'

0 commit comments

Comments
 (0)