Wire libdispatch build path through CMake

Wire libdispatch build path through CMake `build-script-impl ->
lit.site.cfg.in -> lit.cfg` instead of computing it in lit.cfg.

Author: yln

test/lit.cfg

@@ -910,19 +910,18 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
     config.target_runtime = "native"
     config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
 
-    libdispatch_build_dir = make_path(config.swift_obj_root, os.pardir,
-        'libdispatch%s' % config.variant_suffix, 'src')
-    libdispatch_build_artifacts = [
-        make_path(libdispatch_build_dir, 'libdispatch.so'),
-        make_path(libdispatch_build_dir, 'libswiftDispatch.so'),
-        make_path(libdispatch_build_dir, 'swift', 'Dispatch.swiftmodule')]
-    if (all(os.path.exists(p) for p in libdispatch_build_artifacts)):
+    libdispatch_artifact_dir = make_path(config.libdispatch_build_path, 'src')
+    libdispatch_artifacts = [
+        make_path(libdispatch_artifact_dir, 'libdispatch.so'),
+        make_path(libdispatch_artifact_dir, 'libswiftDispatch.so'),
+        make_path(libdispatch_artifact_dir, 'swift', 'Dispatch.swiftmodule')]
+    if (all(os.path.exists(p) for p in libdispatch_artifacts)):
         config.available_features.add('libdispatch')
-        config.libdispatch_build_dir = libdispatch_build_dir
+        config.libdispatch_artifact_dir = libdispatch_artifact_dir
         libdispatch_source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
-        libdispatch_swift_module_dir = make_path(libdispatch_build_dir, 'swift')
+        libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'swift')
         config.import_libdispatch = ('-I %s -I %s -L %s'
-            % (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_build_dir))
+            % (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir))
 
     config.target_build_swift = (
         '%s -target %s %s %s %s %s %s'
@@ -1331,7 +1330,7 @@ if os.path.exists(static_libswiftCore_path):
 # default Swift tests to use the just-built libraries
 target_stdlib_path = platform_module_dir
 if not kIsWindows:
-	libdispatch_path = getattr(config, 'libdispatch_build_dir', '')
+	libdispatch_path = getattr(config, 'libdispatch_artifact_dir', '')
 	if 'use_os_stdlib' not in lit_config.params:
 		lit_config.note('Testing with the just-built libraries at ' + target_stdlib_path)
 		config.target_run = (

test/lit.site.cfg.in

@@ -35,6 +35,7 @@ config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
 
 config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
 config.lldb_build_root = "@LLDB_BUILD_DIR@"
+config.libdispatch_build_path = "@SWIFT_PATH_TO_LIBDISPATCH_BUILD@"
 
 # Please remember to handle empty strings and/or unset variables correctly.
 

utils/build-script-impl

@@ -2385,6 +2385,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DSWIFT_PATH_TO_CMARK_SOURCE:PATH="${CMARK_SOURCE_DIR}"
                     -DSWIFT_PATH_TO_CMARK_BUILD:PATH="$(build_directory ${host} cmark)"
                     -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH="${LIBDISPATCH_SOURCE_DIR}"
+                    -DSWIFT_PATH_TO_LIBDISPATCH_BUILD:PATH="$(build_directory ${host} libdispatch)"
                 )
 
                 if [[ ! "${SKIP_BUILD_LIBICU}" ]] ; then

validation-test/lit.site.cfg.in

@@ -33,6 +33,7 @@ config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
 
 config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
 config.lldb_build_root = "@LLDB_BUILD_DIR@"
+config.libdispatch_build_path = "@SWIFT_PATH_TO_LIBDISPATCH_BUILD@"
 
 if "@SWIFT_ASAN_BUILD@" == "TRUE":
     config.available_features.add("asan")