Remove all references to xargo
This commit is contained in:
parent
91dc948dd6
commit
3c63648d19
|
@ -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
|
||||
|
||||
|
|
|
@ -626,7 +626,6 @@ else
|
|||
fi
|
||||
|
||||
cargoInstall cargo-config 0.1.1
|
||||
cargoInstall xargo 0.3.20
|
||||
|
||||
if [ "$dependenciesonly" = false ]; then
|
||||
boot
|
||||
|
|
2
cookbook
2
cookbook
|
@ -1 +1 @@
|
|||
Subproject commit d63c62a70d3f37cade2c232fcb6d57f869b7c49a
|
||||
Subproject commit c619997825027d4b49902777acbf1b2b939b639e
|
|
@ -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; \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue