diff --git a/README.md b/README.md index 71cba2557b7528fe3a3eb6b76f5c4020ae2348f1..249db597b9ab147c1f88897b348960da7fcc1a90 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 254ef23eac3f8b25bb828e7087fb68ea07880ba9..bc036317a27b60f2da06e22b38133582f2c4c567 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 d63c62a70d3f37cade2c232fcb6d57f869b7c49a..c619997825027d4b49902777acbf1b2b939b639e 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit d63c62a70d3f37cade2c232fcb6d57f869b7c49a +Subproject commit c619997825027d4b49902777acbf1b2b939b639e diff --git a/docker/Dockerfile b/docker/Dockerfile index 44c79f18cd39ce19975387d75c92b2393fc0ce2d..736043e8946b073de57709bf58969817b0589c8e 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 269d29c5d97ad681bef6effc597bf4aa774f2cc0..598f046654d0002a9add904af60ec6fbb4203fbf 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 9955bee47c8d5825330c30da40fdbad6fcd2003a..b217c5cffcd873cb9a86632f8f3fcb34b136dc11 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