Disuse unversioned triples on non-Darwin platforms.

The target flag should take the versioned triple, otherwise on platforms
with versioned triples, the standard library won't be found.

On Darwin, the unversioned triple should still be used throughout. This
necessitates special-casing in the bootstrap script and when making
subdirectories during the build.

See TSC pr #229.

Author: 3405691582

Sources/Commands/SwiftTool.swift

@@ -656,7 +656,8 @@ public class SwiftTool {
             // FIXME: At the moment we just pass the built products directory for the host. We will need to extend this
             // with a map of the names of tools available to each plugin. In particular this would not work with any
             // binary targets.
-            let builtToolsDir = dataDir.appending(components: try self._hostToolchain.get().triple.tripleString, buildEnvironment.configuration.dirname)
+            let hostTriple = try self._hostToolchain.get().triple
+            let builtToolsDir = dataDir.appending(components: hostTriple.platformBuildPathComponent(), buildEnvironment.configuration.dirname)
             let diagnostics = DiagnosticsEngine()
 
             // Create the cache directory, if needed.
@@ -768,8 +769,14 @@ public class SwiftTool {
             // Use "apple" as the subdirectory because in theory Xcode build system
             // can be used to build for any Apple platform and it has it's own
             // conventions for build subpaths based on platforms.
-            let dataPath = buildPath.appending(
-                 component: options.buildSystem == .xcode ? "apple" : triple.tripleString)
+            let subdir: String
+            if triple.isDarwin() {
+                let unversionedTriple = triple.tripleString(forPlatformVersion: "")
+                subdir = options.buildSystem == .xcode ? "apple" : unversionedTriple
+            } else {
+                subdir = triple.tripleString
+            }
+            let dataPath = buildPath.appending(component: subdir)
             return BuildParameters(
                 dataPath: dataPath,
                 configuration: options.configuration,
@@ -945,3 +952,13 @@ extension DispatchTimeInterval {
         }
     }
 }
+
+extension Triple {
+  public func platformBuildPathComponent() -> String {
+    if isDarwin() {
+      return tripleString(forPlatformVersion: "")
+    }
+
+    return tripleString
+  }
+}

Tests/CommandsTests/BuildToolTests.swift

@@ -74,7 +74,7 @@ final class BuildToolTests: XCTestCase {
     func testBinPathAndSymlink() throws {
         fixture(name: "ValidLayouts/SingleModule/ExecutableNew") { path in
             let fullPath = resolveSymlinks(path)
-            let targetPath = fullPath.appending(components: ".build", Resources.default.toolchain.triple.tripleString)
+            let targetPath = fullPath.appending(components: ".build", Resources.default.toolchain.triple.platformBuildPathComponent())
             let xcbuildTargetPath = fullPath.appending(components: ".build", "apple")
             XCTAssertEqual(try execute(["--show-bin-path"], packagePath: fullPath).stdout,
                            "\(targetPath.appending(component: "debug").pathString)\n")

Tests/CommandsTests/PackageToolTests.swift

@@ -586,7 +586,7 @@ final class PackageToolTests: XCTestCase {
             _ = try SwiftPMProduct.SwiftPackage.execute(["edit", "baz", "--branch", "bugfix"], packagePath: fooPath)
 
             // Path to the executable.
-            let exec = [fooPath.appending(components: ".build", Resources.default.toolchain.triple.tripleString, "debug", "foo").pathString]
+            let exec = [fooPath.appending(components: ".build", Resources.default.toolchain.triple.platformBuildPathComponent(), "debug", "foo").pathString]
 
             // We should see it now in packages directory.
             let editsPath = fooPath.appending(components: "Packages", "bar")
@@ -660,7 +660,7 @@ final class PackageToolTests: XCTestCase {
             // Build it.
             XCTAssertBuilds(packageRoot)
             let buildPath = packageRoot.appending(component: ".build")
-            let binFile = buildPath.appending(components: Resources.default.toolchain.triple.tripleString, "debug", "Bar")
+            let binFile = buildPath.appending(components: Resources.default.toolchain.triple.platformBuildPathComponent(), "debug", "Bar")
             XCTAssertFileExists(binFile)
             XCTAssert(localFileSystem.isDirectory(buildPath))
 
@@ -679,7 +679,7 @@ final class PackageToolTests: XCTestCase {
             // Build it.
             XCTAssertBuilds(packageRoot)
             let buildPath = packageRoot.appending(component: ".build")
-            let binFile = buildPath.appending(components: Resources.default.toolchain.triple.tripleString, "debug", "Bar")
+            let binFile = buildPath.appending(components: Resources.default.toolchain.triple.platformBuildPathComponent(), "debug", "Bar")
             XCTAssertFileExists(binFile)
             XCTAssert(localFileSystem.isDirectory(buildPath))
             // Clean, and check for removal of the build directory but not Packages.
@@ -749,7 +749,7 @@ final class PackageToolTests: XCTestCase {
             func build() throws -> String {
                 return try SwiftPMProduct.SwiftBuild.execute([], packagePath: fooPath).stdout
             }
-            let exec = [fooPath.appending(components: ".build", Resources.default.toolchain.triple.tripleString, "debug", "foo").pathString]
+            let exec = [fooPath.appending(components: ".build", Resources.default.toolchain.triple.platformBuildPathComponent(), "debug", "foo").pathString]
 
             // Build and sanity check.
             _ = try build()

Tests/FunctionalTests/ToolsVersionTests.swift

@@ -91,7 +91,7 @@ class ToolsVersionTests: XCTestCase {
 
             // Build the primary package.
             _ = try SwiftPMProduct.SwiftBuild.execute([], packagePath: primaryPath)
-            let exe = primaryPath.appending(components: ".build", Resources.default.toolchain.triple.tripleString, "debug", "Primary").pathString
+            let exe = primaryPath.appending(components: ".build", Resources.default.toolchain.triple.platformBuildPathComponent(), "debug", "Primary").pathString
             // v1 should get selected because v1.0.1 depends on a (way) higher set of tools.
             XCTAssertEqual(try Process.checkNonZeroExit(args: exe).spm_chomp(), "[email protected]")
 

Utilities/bootstrap

@@ -291,7 +291,9 @@ def get_build_target(args, cross_compile=False):
         target_info_json = subprocess.check_output(command,
                                stderr=subprocess.PIPE, universal_newlines=True).strip()
         args.target_info = json.loads(target_info_json)
-        return args.target_info["target"]["unversionedTriple"]
+        if platform.system() == 'Darwin':
+          return args.target_info["target"]["unversionedTriple"]
+        return args.target_info["target"]["triple"]
     except Exception as e:
         # Temporary fallback for Darwin.
         if platform.system() == 'Darwin':