vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove all references to xargo

Browse source
This commit is contained in:
Jeremy Soller 2023-02-21 11:53:37 -07:00
parent 91dc948dd6
commit 3c63648d19
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
6 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -135,8 +135,8 @@ $ ./bootstrap.sh -d
$ curl https://sh.rustup.rs -sSf | sh $ curl https://sh.rustup.rs -sSf | sh
$ source $HOME/.cargo/env $ source $HOME/.cargo/env
# Install the sysroot manager Xargo and cargo-config # Install cargo-config
$ cargo install xargo cargo-config $ cargo install cargo-config
# For successive builds start here. If this is your first build, just continue # For successive builds start here. If this is your first build, just continue

1
bootstrap.sh
View file

@ -626,7 +626,6 @@ else
fi fi
cargoInstall cargo-config 0.1.1 cargoInstall cargo-config 0.1.1
cargoInstall xargo 0.3.20
if [ "$dependenciesonly" = false ]; then if [ "$dependenciesonly" = false ]; then
boot boot

2
cookbook

@ -1 +1 @@
Subproject commit d63c62a70d3f37cade2c232fcb6d57f869b7c49a Subproject commit c619997825027d4b49902777acbf1b2b939b639e

1
docker/Dockerfile
View file

@ -30,7 +30,6 @@ RUN set -ex; \
x86-64-unknown-redox-binutils \ x86-64-unknown-redox-binutils \
x86-64-unknown-redox-gcc \ x86-64-unknown-redox-gcc \
; \ ; \
cargo install xargo; \
cargo install cargo-config; \ cargo install cargo-config; \
apt-get autoremove -q -y; \ apt-get autoremove -q -y; \
apt-get clean -q -y; \ apt-get clean -q -y; \

1
mk/config.mk
View file

@ -53,7 +53,6 @@ endif
# Automatic variables # Automatic variables
ROOT=$(CURDIR) ROOT=$(CURDIR)
export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt
export XARGO_RUST_SRC=$(ROOT)/rust/src
## Userspace variables ## Userspace variables
export TARGET=$(ARCH)-unknown-redox export TARGET=$(ARCH)-unknown-redox

1
podman/rustinstall.sh
View file

@ -4,4 +4,3 @@
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly 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.1.1 cargo-config
cargo install --force --version 0.3.20 xargo