Cross-compile flags should be in get_swiftpm_flags

These flags were only passed for regular builds, but not for testing or
other actions.

rdar://problem/68542579

(cherry picked from commit f691b1e)

Author: neonichu

Utilities/bootstrap

@@ -472,13 +472,6 @@ def build_swiftpm_with_swiftpm(args):
         "--disable-sandbox",
     ]
 
-    build_target = get_build_target(args)
-    cross_compile_hosts = args.cross_compile_hosts
-    if build_target == 'x86_64-apple-macosx' and "macosx-arm64" in cross_compile_hosts:
-        swiftpm_args += ["--arch", "x86_64", "--arch", "arm64"]
-    elif cross_compile_hosts:
-        error("cannot cross-compile for %s" % cross_compile_hosts)
-
     call_swiftpm(args, swiftpm_args)
 
     # Setup symlinks that'll allow using swiftpm from the build directory.
@@ -610,6 +603,13 @@ def get_swiftpm_flags(args):
     if 'ANDROID_DATA' in os.environ:
         build_flags.extend(["-Xswiftc", "-Xcc", "-Xswiftc", "-U_GNU_SOURCE"])
 
+    build_target = get_build_target(args)
+    cross_compile_hosts = args.cross_compile_hosts
+    if build_target == 'x86_64-apple-macosx' and "macosx-arm64" in cross_compile_hosts:
+        build_flags += ["--arch", "x86_64", "--arch", "arm64"]
+    elif cross_compile_hosts:
+        error("cannot cross-compile for %s" % cross_compile_hosts)
+
     return build_flags
 
 if __name__ == '__main__':