On ELF platforms, add a runpath to an architecture-specific directory for the runtime libraries.

This is needed for swiftlang/swift#63782, which changes the Unix toolchain to look
for libraries in architecture-specific directories.

I also updated some checks for the runtime target triple, rather than checking the host
system, and removed unnecessary regex checking.

Author: finagolfin

build-script-helper.py

@@ -19,7 +19,6 @@
 import json
 import sys
 import os, platform
-import re
 import subprocess
 
 def printerr(message):
@@ -159,7 +158,10 @@ def get_swiftpm_options(action, args):
   if args.verbose or action == 'install':
     swiftpm_args += ['--verbose']
 
-  if platform.system() == 'Darwin':
+  build_target = get_build_target(args)
+  build_arch = build_target.split('-')[0]
+  build_os = build_target.split('-')[2]
+  if build_os.startswith('macosx'):
     swiftpm_args += [
       # Relative library rpath for swift; will only be used when /usr/lib/swift
       # is not available.
@@ -168,13 +170,12 @@ def get_swiftpm_options(action, args):
   else:
     swiftpm_args += [
       # Library rpath for swift, dispatch, Foundation, etc. when installing
-      '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/linux',
+      '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/' + build_os + '/' + build_arch,
     ]
 
-  build_target = get_build_target(args)
   cross_compile_hosts = args.cross_compile_hosts
   if cross_compile_hosts:
-    if re.search('-apple-macosx', build_target) and re.match('macosx-', cross_compile_hosts):
+    if build_os.startswith('macosx') and cross_compile_hosts.startswith('macosx-'):
       swiftpm_args += ["--arch", "x86_64", "--arch", "arm64"]
     else:
       printerr("cannot cross-compile for %s" % cross_compile_hosts)
@@ -290,7 +291,7 @@ def get_build_target(args):
   command = [args.swift_exec, '-print-target-info']
   target_info_json = subprocess.check_output(command, stderr=subprocess.PIPE, universal_newlines=True).strip()
   args.target_info = json.loads(target_info_json)
-  if platform.system() == 'Darwin':
+  if '-apple-macosx' in args.target_info["target"]["unversionedTriple"]:
     return args.target_info["target"]["unversionedTriple"]
 
   return args.target_info["target"]["triple"]