Use the versioned triple outside of Darwin.

Some platforms require the normal, versioned triple to be supplied for
the target flag, as Swift modules use this versioned triple as a
subdirectory. If the unversioned triple is used instead, the standard
library won't be found on these platforms.

Instead, use the unversioned triple only on Darwin. This also should be
a noop on Linux. This behavior matches swiftlang/swift-package-manager#3576
and swiftlang/swift-tools-support-core#229 which contain additional context.

Author: 3405691582

Utilities/build-script-helper.py

@@ -601,7 +601,10 @@ def get_build_target(swiftc_path, args):
                                                    stderr=subprocess.PIPE,
                                                    universal_newlines=True).strip()
         args.target_info = json.loads(target_info_json)
-        return args.target_info['target']['unversionedTriple']
+        triple = args.target_info['target']['triple']
+        if platform.system() == 'Darwin':
+          triple = args.target_info['target']['unversionedTriple']
+        return triple
     except Exception as e:
         error(str(e))