From c48ac378926323d30028d1d3d93327a5769ef354 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 23 Sep 2020 14:06:06 -0700 Subject: [PATCH] Workspace: remove unnecessary flags on Windows This cleans up the unnecessary flags now that they are not absolutely required. This will break compatibility with older releases, however, because there is no current stable release on Windows with swift-package-manager support, this is acceptable. --- Sources/Workspace/UserToolchain.swift | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Sources/Workspace/UserToolchain.swift b/Sources/Workspace/UserToolchain.swift index fca40bbbbf7..70a3823f671 100644 --- a/Sources/Workspace/UserToolchain.swift +++ b/Sources/Workspace/UserToolchain.swift @@ -245,19 +245,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 } }