From bc1f613bd126f53bf894c87bfec8f69b2df93bf6 Mon Sep 17 00:00:00 2001
From: Bassam Khouri <bkhouri@apple.com>
Date: Thu, 11 Dec 2025 10:21:32 -0500
Subject: [PATCH] Update build-using-self

Update the build-using-self to the `swift-build` and `swift-test`
executable targets are built using the native build system

Fixes: #9070
---
 Utilities/build-using-self | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Utilities/build-using-self b/Utilities/build-using-self
index 9650b68f8f6..3370a64637c 100755
--- a/Utilities/build-using-self
+++ b/Utilities/build-using-self
@@ -132,13 +132,25 @@ def log_environment() -> None:
         logging.info("  --> %s=%r", key, value)
 
 
+BUILD_OVERRIDES: t.List[str] = [
+    "--build-system",
+    "native",
+]
+
+
 def get_swiftpm_bin_dir(
         *,
         global_args: t.List[str],
 ) -> pathlib.Path:
     logging.info("Retrieving Swift PM binary directory.")
     swiftpm_bin_dir = pathlib.Path(
-        call_output(["swift", "build", *global_args, "--show-bin-path"])
+        call_output([
+            "swift",
+            "build",
+            *global_args,
+            *BUILD_OVERRIDES,
+            "--show-bin-path",
+        ])
     )
     logging.info("SwiftPM BIN DIR: %s", swiftpm_bin_dir)
     return swiftpm_bin_dir
@@ -245,6 +257,7 @@ def main() -> None:
                         "swift",
                         "package",
                         *global_args,
+                        *BUILD_OVERRIDES,
                         "clean",
                     ]
                 )
@@ -257,6 +270,7 @@ def main() -> None:
                         "swift",
                         "package",
                         *global_args,
+                        *BUILD_OVERRIDES,
                         "update",
                     ]
                 )
@@ -268,6 +282,7 @@ def main() -> None:
                     "swift",
                     "build",
                     *global_args,
+                    *BUILD_OVERRIDES,
                     "--build-tests",
                     *ignore_args,
                     *args.additional_build_args.split(" ")
@@ -281,6 +296,7 @@ def main() -> None:
                     "swift",
                     "run",
                     *global_args,
+                    *BUILD_OVERRIDES,
                     *ignore_args,
                     *args.additional_run_args.split(" "),
                     "swift-test",