Merge pull request apple#2953 from compnerd/cleanup

Workspace: remove unnecessary flags on Windows
artemcm · Oct 12, 2020 · 73bc647 · 73bc647
2 parents 4c4476f + c48ac37
commit 73bc647
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/Sources/Workspace/UserToolchain.swift b/Sources/Workspace/UserToolchain.swift
@@ -251,19 +251,7 @@ public final class UserToolchain: Toolchain {
                         }
                     }
 
-                    return [
-                        "-sdk", root.pathString,
-
-                        // FIXME: these should not be necessary with the `-sdk`
-                        // parameter.  However, it seems that the layout on Windows
-                        // is not entirely correct yet and the driver does not pick
-                        // up the include search path, library search path, nor
-                        // resource dir.  Workaround that for the time being to
-                        // enable use of swift-package-manager on Windows.
-                        "-I", root.appending(RelativePath("usr/lib/swift")).pathString,
-                        "-L", root.appending(RelativePath("usr/lib/swift/windows")).pathString,
-                        "-resource-dir", root.appending(RelativePath("usr/lib/swift")).pathString,
-                    ] + xctest + runtime
+                    return [ "-sdk", root.pathString, ] + runtime + xctest
                 }
             }