Update lit.cfg

Author: compnerd

test/lit.cfg

@@ -547,42 +547,30 @@ else:
     config.swift_driver = (
         "%r %s %s %s"
         % (config.swift, mcp_opt, config.swift_test_options, config.swift_driver_test_options))
-
     if kIsWindows:
         config.swift_driver += " -libc " + config.swift_stdlib_msvc_runtime
-
     config.swiftc_driver = (
-        "%r -g %s %s %s %s" % (
+        "%r %s %s %s %s" % (
             config.swiftc,
-            '' if kIsWindows else '-no-toolchain-stdlib-rpath',
+            '' if kIsWindows else '-toolchain-stdlib-rpath',
             mcp_opt,
             config.swift_test_options,
             config.swift_driver_test_options
         )
     )
-
     # Parse the host triple.
     (host_cpu, host_vendor, host_os, host_vers) = re.match('([^-]+)-([^-]+)-([^0-9-]+)(.*)', config.host_triple).groups()
     toolchain_lib_dir = make_path(config.swift_lib_dir, 'swift', host_os)
-    if kIsWindows:
-        config.host_build_swift = (
-            "%s -target %s -I %s -L %s" % (
-                config.swiftc_driver,
-                config.host_triple,
-                config.swift_host_lib_dir,
-                config.swift_host_lib_dir,
-            )
-        )
-    else:
-        config.host_build_swift = (
-            "%s -target %s -g -no-toolchain-stdlib-rpath -I %s -L %s -Xlinker -rpath -Xlinker %s" % (
-                config.swiftc_driver,
-                config.host_triple,
-                config.swift_host_lib_dir,
-                config.swift_host_lib_dir,
-                toolchain_lib_dir
-            )
+    config.host_build_swift = (
+        "%s -target %s -g %s -I %s -L %s %s" % (
+            config.swiftc_driver,
+            config.host_triple,
+            '' if kIsWindows else '-no-toolchain-stdlib-rpath',
+            config.swift_host_lib_dir,
+            config.swift_host_lib_dir,
+            '' if kIsWindows else '-Xlinker -rpath -Xlinker {}'.format(toolchain_lib_dir)
         )
+    )
 
 config.substitutions.append( ('%llvm_obj_root', config.llvm_obj_root) )
 config.substitutions.append( ('%swift-bin-dir', config.swift_bin_dir) )