Move rust-snapshot-hash to the root.

This commit is contained in:
Simon Sapin 2014-08-22 09:49:45 +01:00
parent c20e63c116
commit c836784d53
3 changed files with 2 additions and 2 deletions

2
configure vendored
View file

@ -456,7 +456,7 @@ else
step_msg "Using binary Rust snapshot"
make_dir ${CFG_BUILD_DIR}/rust_snapshot
CFG_SNAPSHOT_RUSTC=1
SNAPSHOT_VERSION=$(cat ${CFG_SRC_DIR}/src/rust-snapshot-hash | rev | cut -d/ -f1 | rev)
SNAPSHOT_VERSION=$(cat ${CFG_SRC_DIR}/rust-snapshot-hash | rev | cut -d/ -f1 | rev)
CFG_LOCAL_RUST_ROOT=${CFG_BUILD_DIR}rust_snapshot/${SNAPSHOT_VERSION}-${DEFAULT_TARGET}
CFG_RUST_HOME=${CFG_LOCAL_RUST_ROOT}
fi

View file

@ -94,7 +94,7 @@ $(CFG_BUILD_HOME)config.stamp : $(S)configure $(S)Makefile.in
$(Q)$(S)configure $(CFG_CONFIGURE_ARGS)
SNAPSHOT_HASH_FILE=$(S)/src/rust-snapshot-hash
SNAPSHOT_HASH_FILE=$(S)/rust-snapshot-hash
SNAPSHOT_VERSION=$(shell cat $(SNAPSHOT_HASH_FILE) | rev | cut -d/ -f1 | rev)
SNAPSHOT_HASH=$(shell cat $(SNAPSHOT_HASH_FILE) | cut -d/ -f1)
SNAPSHOT_URL="https://servo-rust.s3.amazonaws.com/$(shell cat $(SNAPSHOT_HASH_FILE))-$(DEFAULT_TARGET).tar.gz"