From 3c63648d195f4e962649b5953bb96ffa2cee6e16 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 21 Feb 2023 11:53:37 -0700
Subject: [PATCH] Remove all references to xargo
---
README.md | 4 ++--
bootstrap.sh | 1 -
cookbook | 2 +-
docker/Dockerfile | 1 -
mk/config.mk | 1 -
podman/rustinstall.sh | 1 -
6 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 71cba2557..249db597b 100644
--- a/README.md
+++ b/README.md
@@ -135,8 +135,8 @@ $ ./bootstrap.sh -d
$ curl https://sh.rustup.rs -sSf | sh
$ source $HOME/.cargo/env
-# Install the sysroot manager Xargo and cargo-config
-$ cargo install xargo cargo-config
+# Install cargo-config
+$ cargo install cargo-config
# For successive builds start here. If this is your first build, just continue
diff --git a/bootstrap.sh b/bootstrap.sh
index 254ef23ea..bc036317a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -626,7 +626,6 @@ else
fi
cargoInstall cargo-config 0.1.1
-cargoInstall xargo 0.3.20
if [ "$dependenciesonly" = false ]; then
boot
diff --git a/cookbook b/cookbook
index d63c62a70..c61999782 160000
--- a/cookbook
+++ b/cookbook
@@ -1 +1 @@
-Subproject commit d63c62a70d3f37cade2c232fcb6d57f869b7c49a
+Subproject commit c619997825027d4b49902777acbf1b2b939b639e
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 44c79f18c..736043e89 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,6 @@ RUN set -ex; \
x86-64-unknown-redox-binutils \
x86-64-unknown-redox-gcc \
; \
- cargo install xargo; \
cargo install cargo-config; \
apt-get autoremove -q -y; \
apt-get clean -q -y; \
diff --git a/mk/config.mk b/mk/config.mk
index 269d29c5d..598f04665 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -53,7 +53,6 @@ endif
# Automatic variables
ROOT=$(CURDIR)
export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt
-export XARGO_RUST_SRC=$(ROOT)/rust/src
## Userspace variables
export TARGET=$(ARCH)-unknown-redox
diff --git a/podman/rustinstall.sh b/podman/rustinstall.sh
index 9955bee47..b217c5cff 100755
--- a/podman/rustinstall.sh
+++ b/podman/rustinstall.sh
@@ -4,4 +4,3 @@
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
cargo install --force --version 0.1.1 cargo-config
-cargo install --force --version 0.3.20 xargo
--
GitLab