Merge pull request #338 from buttaface/rpath

[SR-1625] Remove LD_LIBRARY_PATH from tests

Author: briancroom

Tests/Functional/lit.cfg

@@ -119,16 +119,10 @@ else:
                 '-L', os.path.join(libdispatch_build_dir, 'src', 'swift'),
             ])
 
-    config.environment['LD_LIBRARY_PATH'] = ":".join([
-      libdispatch_build_dir,
-      os.path.join(libdispatch_build_dir, 'src'),
-      foundation_dir,
-      os.path.join(foundation_dir, 'Foundation'),
-      os.path.join(foundation_dir, 'Sources', 'Foundation'),
-      os.path.join(foundation_dir, 'Sources', 'FoundationNetworking'),
-      os.path.join(foundation_dir, 'Sources', 'FoundationXML'),
-      os.path.join(foundation_dir, 'lib'),
-    ])
+            if platform.system() != 'Windows':
+                swift_exec.extend([
+                    '-Xlinker', '-rpath', '-Xlinker', libdispatch_build_dir,
+                ])
 
 # Having prepared the swiftc command, we set the substitution.
 config.substitutions.append(('%{swiftc}', ' '.join(swift_exec)))