<rdar://43616773> Add -toolchain-stdlib-rpath to test configs, to run in-tree.

Author: graydon

test/lit.cfg

@@ -375,10 +375,10 @@ config.substitutions.append( ('%swift_driver_plain', "%r" % config.swift) )
 config.substitutions.append( ('%swiftc_driver_plain', "%r" % config.swiftc) )
 if kIsWindows:
     config.substitutions.append( ('%swift_driver', "%r %s %s %s" % (config.swift, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
-    config.substitutions.append( ('%swiftc_driver', "%r %s %s %s" % (config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
+    config.substitutions.append( ('%swiftc_driver', "%r -toolchain-stdlib-rpath %s %s %s" % (config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
 else:
     config.substitutions.append( ('%swift_driver', "env SDKROOT= %r %s %s %s" % (config.swift, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
-    config.substitutions.append( ('%swiftc_driver', "env SDKROOT= %r %s %s %s" % (config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
+    config.substitutions.append( ('%swiftc_driver', "env SDKROOT= %r -toolchain-stdlib-rpath %s %s %s" % (config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
 config.substitutions.append( ('%sil-opt', "%r %s %s" % (config.sil_opt, mcp_opt, config.sil_test_options)) )
 config.substitutions.append( ('%sil-func-extractor', "%r %s" % (config.sil_func_extractor, mcp_opt)) )
 config.substitutions.append( ('%sil-llvm-gen', "%r %s" % (config.sil_llvm_gen, mcp_opt)) )
@@ -691,7 +691,8 @@ if run_vendor == 'apple':
            (run_cpu, run_os, run_vers, clang_mcp_opt))
 
        config.target_build_swift = (
-           "%s %s %s -F %r -Xlinker -rpath -Xlinker %r %s %s %s %s" %
+           ("%s %s %s -F %r -toolchain-stdlib-rpath " +
+            "-Xlinker -rpath -Xlinker %r %s %s %s %s") %
            (xcrun_prefix, config.swiftc, target_options,
             extra_frameworks_dir,
             "/tmp/swifttest-device/lib",
@@ -725,7 +726,7 @@ if run_vendor == 'apple':
             (run_cpu, run_os, run_vers, clang_mcp_opt))
 
         config.target_build_swift = (
-            "%s %s %s -F %r %s %s %s %s" %
+            "%s %s %s -F %r -toolchain-stdlib-rpath %s %s %s %s" %
             (xcrun_prefix, config.swiftc, target_options,
              extra_frameworks_dir,
              sdk_overlay_linker_opt, config.swift_test_options,
@@ -759,7 +760,9 @@ if run_vendor == 'apple':
             (run_cpu, run_os, run_vers, clang_mcp_opt))
 
         config.target_build_swift = (
-            "%s %s %s -F %r -Xlinker -rpath -Xlinker %r %s %s %s %s -F %r -Xlinker -rpath -Xlinker %r"
+            ("%s %s %s -F %r -toolchain-stdlib-rpath "
+             + "-Xlinker -rpath -Xlinker %r %s %s %s %s "
+             + "-F %r -Xlinker -rpath -Xlinker %r")
             % (xcrun_prefix, config.swiftc, target_options,
                extra_frameworks_dir, extra_frameworks_dir,
                sdk_overlay_linker_opt, config.swift_test_options,
@@ -809,7 +812,7 @@ if run_vendor == 'apple':
     subst_target_swift_ide_test_mock_sdk_after = \
         target_options_for_mock_sdk_after
     config.target_swiftc_driver = (
-        "%s %s %s" %
+        "%s %s -toolchain-stdlib-rpath %s" %
         (xcrun_prefix, config.swiftc, target_options))
     config.target_clang = (
         "%s clang++ %s" %
@@ -906,7 +909,7 @@ 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")
     config.target_build_swift = (
-        '%s -target %s %s %s %s %s %s'
+        '%s -target %s -toolchain-stdlib-rpath %s %s %s %s %s'
         % (config.swiftc, config.variant_triple, resource_dir_opt, mcp_opt,
            config.swift_test_options, config.swift_driver_test_options,
            swift_execution_tests_extra_flags))
@@ -934,7 +937,7 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
     subst_target_swift_ide_test_mock_sdk = config.target_swift_ide_test
     subst_target_swift_ide_test_mock_sdk_after = ""
     config.target_swiftc_driver = (
-        "%s -target %s %s %s" %
+        "%s -target %s -toolchain-stdlib-rpath %s %s" %
         (config.swiftc, config.variant_triple, resource_dir_opt, mcp_opt))
     config.target_swift_modulewrap = (
         '%s -modulewrap -target %s' %
@@ -1054,6 +1057,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     config.target_swiftc_driver = ' '.join([
         config.swiftc,
         '-target', config.variant_triple,
+        '-toolchain-stdlib-rpath',
         '-sdk', config.variant_sdk,
         '-tools-directory', tools_directory,
         android_link_paths_opt, resource_dir_opt, mcp_opt,