summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-01 12:24:06 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-09-01 13:43:22 +0200
commitd897f56bac65fb79c159b0f24e2e399fac1388fa (patch)
tree0e8dbf73b515ff5eb7756e197ed690397a827e32
parent49cc4528b4d31706796b8bb08e5d18db4b23db7c (diff)
downloadrust-d897f56bac65fb79c159b0f24e2e399fac1388fa.tar.gz
rust-d897f56bac65fb79c159b0f24e2e399fac1388fa.tar.xz
rust: fix beta
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/dev-lang/rust/rust-1.20.0-scm.exheres-02
-rw-r--r--packages/dev-lang/rust/rust-build.exlib5
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/dev-lang/rust/rust-1.20.0-scm.exheres-0 b/packages/dev-lang/rust/rust-1.20.0-scm.exheres-0
index 82036ff..7360988 100644
--- a/packages/dev-lang/rust/rust-1.20.0-scm.exheres-0
+++ b/packages/dev-lang/rust/rust-1.20.0-scm.exheres-0
@@ -62,7 +62,7 @@ SCM_rust_installer_v2_EXTERNAL_REFS="
require github [ user=rust-lang ]
# Get these from src/stage0.txt
-require rust-build [ date=2017-08-27 rustc_required=1.20.0 bootstrap_cargo=0.21.0 importance=500 ]
+require rust-build [ date=2017-08-27 rustc_required=1.20.0 bootstrap_cargo=0.21.0 dev=true importance=500 ]
PLATFORMS="~amd64"
SLOT="beta"
diff --git a/packages/dev-lang/rust/rust-build.exlib b/packages/dev-lang/rust/rust-build.exlib
index 00094c3..5370d6d 100644
--- a/packages/dev-lang/rust/rust-build.exlib
+++ b/packages/dev-lang/rust/rust-build.exlib
@@ -12,6 +12,7 @@ myexparam bootstrap_cargo=${BOOTSTRAP_RUSTC}
exparam -v BOOTSTRAP_CARGO bootstrap_cargo
myexparam importance=
exparam -v IMPORTANCE importance
+myexparam -b dev=false
require cargo alternatives
@@ -92,14 +93,16 @@ rust-build_has_build_deps() {
rust-build_src_fetch_extra() {
if ! rust-build_has_build_deps; then
+ local static_host="https://static.rust-lang.org"
local old_path="${PATH}"
local snap
for path in ${PALUDIS_FETCHERS_DIRS[@]};do
export PATH="${PATH}:${path}"
done
+ exparam -b dev && static_host="https://dev-static.rust-lang.org"
for snap in ${RUSTC_SNAPSHOT} ${STD_SNAPSHOT} ${CARGO_SNAPSHOT}; do
edo rm -f "${FETCHEDDIR}/${snap}.tar.xz"
- dohttps "https://static.rust-lang.org/dist/${RUST_DATE}/${snap}.tar.xz" "${FETCHEDDIR}/${snap}.tar.xz"
+ dohttps "${static_host}/dist/${RUST_DATE}/${snap}.tar.xz" "${FETCHEDDIR}/${snap}.tar.xz"
done
export PATH="${old_path}"
fi