From c836784d53a6ae76aef8c3c70f4f72a30ec79395 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 22 Aug 2014 09:49:45 +0100 Subject: [PATCH] Move rust-snapshot-hash to the root. --- configure | 2 +- mk/main.mk | 2 +- src/rust-snapshot-hash => rust-snapshot-hash | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/rust-snapshot-hash => rust-snapshot-hash (100%) diff --git a/configure b/configure index 90d5ecc97a6..1fdcbe6dc7b 100755 --- a/configure +++ b/configure @@ -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 diff --git a/mk/main.mk b/mk/main.mk index 90e6e007baf..56694e15c82 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -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" diff --git a/src/rust-snapshot-hash b/rust-snapshot-hash similarity index 100% rename from src/rust-snapshot-hash rename to rust-snapshot-hash