Compare commits
No commits in common. "a55ed115f575150115191e19908ce8fcc8351d77" and "a6d3efa373177fcf85d2170cf5159df1e4b65215" have entirely different histories.
a55ed115f5
...
a6d3efa373
|
@ -138,8 +138,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 the sysroot manager Xargo
|
||||
$ cargo install xargo
|
||||
|
||||
# For successive builds start here. If this is your first build, just continue
|
||||
|
||||
|
|
19
bootstrap.sh
19
bootstrap.sh
|
@ -371,18 +371,6 @@ usage()
|
|||
exit
|
||||
}
|
||||
|
||||
|
||||
#############################################################
|
||||
# Looks for and installs a cargo-managed binary or subcommand
|
||||
#############################################################
|
||||
cargoInstall() {
|
||||
if [[ "`cargo install --list`" != *"$1"* ]]; then
|
||||
cargo install $1
|
||||
else
|
||||
echo "You have $1 installed already!"
|
||||
fi
|
||||
}
|
||||
|
||||
####################################################################################
|
||||
# This function takes care of everything associated to rust, and the version manager
|
||||
# That controls it, it can install rustup and uninstall multirust as well as making
|
||||
|
@ -493,8 +481,11 @@ boot()
|
|||
echo "Cloning gitlab repo..."
|
||||
git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
|
||||
rustInstall
|
||||
cargoInstall cargo-config
|
||||
cargoInstall xargo
|
||||
if [[ "`cargo install --list`" != *"xargo"* ]]; then
|
||||
cargo install xargo
|
||||
else
|
||||
echo "You have xargo installed already!"
|
||||
fi
|
||||
echo "Cleaning up..."
|
||||
rm bootstrap.sh
|
||||
echo
|
||||
|
|
Reference in New Issue