Merge branch 'fix-bootstrap' into 'master'
bootstrap.sh: Install system dependencies before installing Cargo packages See merge request redox-os/redox!1275
This commit is contained in:
commit
fab7d9d3d9
|
@ -577,8 +577,6 @@ done
|
||||||
banner
|
banner
|
||||||
|
|
||||||
rustInstall
|
rustInstall
|
||||||
cargoInstall cargo-config 0.1.1
|
|
||||||
cargoInstall xargo 0.3.20
|
|
||||||
|
|
||||||
if [ "$update" == "true" ]; then
|
if [ "$update" == "true" ]; then
|
||||||
git pull upstream master
|
git pull upstream master
|
||||||
|
@ -619,6 +617,9 @@ else
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cargoInstall cargo-config 0.1.1
|
||||||
|
cargoInstall xargo 0.3.20
|
||||||
|
|
||||||
if [ "$dependenciesonly" = false ]; then
|
if [ "$dependenciesonly" = false ]; then
|
||||||
boot
|
boot
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue