Merge pull request #2846 from egorzhdan/windows-2

Avoid passing -fPIC compiler argument on Windows

Author: compnerd

Sources/Workspace/Destination.swift

@@ -97,9 +97,9 @@ public struct Destination: Encodable, Equatable {
         let binDir = customBinDir ?? binDir ?? Destination.hostBinDir(
             originalWorkingDirectory: originalWorkingDirectory)
 
-      #if os(macOS)
+        let sdkPath: AbsolutePath?
+#if os(macOS)
         // Get the SDK.
-        let sdkPath: AbsolutePath
         if let value = lookupExecutablePath(filename: ProcessEnv.vars["SDKROOT"]) {
             sdkPath = value
         } else {
@@ -111,35 +111,41 @@ public struct Destination: Encodable, Equatable {
             }
             sdkPath = AbsolutePath(sdkPathStr)
         }
+#else
+        sdkPath = nil
+#endif
 
         // Compute common arguments for clang and swift.
         var extraCCFlags: [String] = []
         var extraSwiftCFlags: [String] = []
+#if os(macOS)
         if let sdkPaths = Destination.sdkPlatformFrameworkPaths(environment: environment) {
             extraCCFlags += ["-F", sdkPaths.fwk.pathString]
             extraSwiftCFlags += ["-F", sdkPaths.fwk.pathString]
             extraSwiftCFlags += ["-I", sdkPaths.lib.pathString]
             extraSwiftCFlags += ["-L", sdkPaths.lib.pathString]
         }
+#endif
+
+#if !os(Windows)
+        extraCCFlags += ["-fPIC"]
+#endif
+
+        var extraCPPFlags: [String] = []
+#if os(macOS)
+        extraCPPFlags += ["-lc++"]
+#else
+        extraCPPFlags += ["-lstdc++"]
+#endif
 
         return Destination(
             target: nil,
             sdk: sdkPath,
             binDir: binDir,
             extraCCFlags: extraCCFlags,
             extraSwiftCFlags: extraSwiftCFlags,
-            extraCPPFlags: ["-lc++"]
-        )
-      #else
-        return Destination(
-            target: nil,
-            sdk: nil,
-            binDir: binDir,
-            extraCCFlags: ["-fPIC"],
-            extraSwiftCFlags: [],
-            extraCPPFlags: ["-lstdc++"]
+            extraCPPFlags: extraCPPFlags
         )
-      #endif
     }
 
     /// Returns macosx sdk platform framework path.