From c3b447055e8540b732148f89ab648f16f1737ada Mon Sep 17 00:00:00 2001
From: Arshia Ghafoori <arshia001@live.com>
Date: Wed, 16 Jul 2025 12:52:24 +0400
Subject: [PATCH] Work around wasmer-headless build failure by switching away
 from Xargo

---
 .github/workflows/build.yml | 3 ---
 Makefile                    | 2 +-
 Xargo.toml                  | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 Xargo.toml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 389c221e34..ec2dca368b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -309,7 +309,6 @@ jobs:
       - name: Build Minimal Wasmer Headless
         if: ${{ !startsWith(matrix.build, 'linux-musl-x64') }}
         run: |
-          cargo install xargo
           echo "" >> Cargo.toml
           echo "[profile.release]" >> Cargo.toml
           echo "opt-level = 'z'" >> Cargo.toml
@@ -321,9 +320,7 @@ jobs:
           echo "incremental = false" >> Cargo.toml
           echo "codegen-units = 1" >> Cargo.toml
           echo "rpath = false" >> Cargo.toml
-          rustup override set nightly-2024-11-07
           make build-wasmer-headless-minimal
-          rustup override unset
       - name: Dist
         run: |
           make distribution
diff --git a/Makefile b/Makefile
index fea61f73fa..d2a25bf881 100644
--- a/Makefile
+++ b/Makefile
@@ -490,7 +490,7 @@ build-wasmer-wasm:
 # rpath = false
 build-wasmer-headless-minimal: RUSTFLAGS += -C panic=abort
 build-wasmer-headless-minimal:
-	RUSTFLAGS="${RUSTFLAGS}" xargo build --target $(HOST_TARGET) --release --manifest-path=lib/cli/Cargo.toml --no-default-features --features sys,headless-minimal --bin wasmer-headless
+	RUSTFLAGS="${RUSTFLAGS}" cargo build --target $(HOST_TARGET) --release --manifest-path=lib/cli/Cargo.toml --no-default-features --features sys,headless-minimal --bin wasmer-headless
 ifeq ($(IS_DARWIN), 1)
 	strip target/$(HOST_TARGET)/release/wasmer-headless
 else ifeq ($(IS_WINDOWS), 1)
diff --git a/Xargo.toml b/Xargo.toml
deleted file mode 100644
index 2b87983bca..0000000000
--- a/Xargo.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[dependencies]
-std = {}