pipeline: Run proper cross compile host

The build-using-self script was always using macos arm64 as a cross
compile host.

Modify the build-using-self's cross compile host to use x86_64 when on
ARM, and arm64 when on another host architecture.

Author: bkhouri

Diff for: Utilities/build-using-self

@@ -89,7 +89,7 @@ def get_swiftpm_bin_dir(config: Configuration) -> pathlib.Path:
 
 
 def is_on_darwin() -> bool:
-    return platform.uname().system == "Darwin"
+    return platform.system() == "Darwin"
 
 
 def set_environment(*, swiftpm_bin_dir: pathlib.Path,) -> None:
@@ -107,22 +107,22 @@ def set_environment(*, swiftpm_bin_dir: pathlib.Path,) -> None:
 
 
 def run_bootstrap(swiftpm_bin_dir: pathlib.Path) -> None:
-    if is_on_darwin():
-        logging.info("Current working directory is %s", pathlib.Path.cwd())
-        logging.info("Bootstrapping with the XCBuild codepath...")
-        call(
-            [
-                REPO_ROOT_PATH / "Utilities" / "bootstrap",
-                "build",
-                "--release",
-                "--verbose",
-                "--cross-compile-hosts",
-                "macosx-arm64",
-                "--skip-cmake-bootstrap",
-                "--swift-build-path",
-                (swiftpm_bin_dir / "swift-build").resolve(),
-            ],
-        )
+    logging.info("Current working directory is %s", pathlib.Path.cwd())
+    logging.info("Bootstrapping with the XCBuild codepath...")
+    cross_compile_arch = "x86_64" if platform.machine() == "arm64" else "arm64"
+    call(
+        [
+            REPO_ROOT_PATH / "Utilities" / "bootstrap",
+            "build",
+            "--release",
+            "--verbose",
+            "--cross-compile-hosts",
+            f"macosx-{cross_compile_arch}",
+            "--skip-cmake-bootstrap",
+            "--swift-build-path",
+            (swiftpm_bin_dir / "swift-build").resolve(),
+        ],
+    )
 
 
 def main() -> None:
@@ -158,7 +158,8 @@ def main() -> None:
             ),
         )
 
-    run_bootstrap(swiftpm_bin_dir=swiftpm_bin_dir)
+    if is_on_darwin():
+        run_bootstrap(swiftpm_bin_dir=swiftpm_bin_dir)
 
 
 if __name__ == "__main__":