Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2986 from ChrisParis/cfg_local_rust_root

Browse source 
Do not use Rust snapshot if --local-rust-root is specified.
This commit is contained in:
Manish Goregaokar 2014-08-02 11:10:05 +05:30
commit 20e8618b83
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure vendored
View file

@ -355,6 +355,11 @@ then
exit 0 exit 0
fi fi
if [ ! -z "$CFG_ENABLE_TREE_RUST" -a ! -z "$CFG_LOCAL_RUST_ROOT" ]
then
err "Specify at most one of --enable-tree-rust and --local-rust-root."
fi
# Split target triple # Split target triple
split_triple "${CFG_TARGET}" TARGET_CPUTYPE TARGET_VENDOR TARGET_OSTYPE split_triple "${CFG_TARGET}" TARGET_CPUTYPE TARGET_VENDOR TARGET_OSTYPE
@ -408,7 +413,7 @@ if [ $CFG_OSTYPE = "linux-androideabi" ]
then then
CFG_ENABLE_TREE_RUST=1 # We don't yet have Android snapshots CFG_ENABLE_TREE_RUST=1 # We don't yet have Android snapshots
fi fi
if [ -z "$CFG_ENABLE_TREE_RUST" ] if [ -z "$CFG_ENABLE_TREE_RUST" -a -z "$CFG_LOCAL_RUST_ROOT" ]
then then
if ! [ -f ${CFG_BUILD_DIR}/rust_snapshot/${SNAPSHOT_VERSION}-${DEFAULT_TARGET}/bin/rustc -a -f ${CFG_BUILD_DIR}/src/compiler/rust-snapshot-hash-stamp -a -z "$(diff ${CFG_BUILD_DIR}/src/compiler/rust-snapshot-hash-stamp ${CFG_SRC_DIR}/src/compiler/rust-snapshot-hash)" ] if ! [ -f ${CFG_BUILD_DIR}/rust_snapshot/${SNAPSHOT_VERSION}-${DEFAULT_TARGET}/bin/rustc -a -f ${CFG_BUILD_DIR}/src/compiler/rust-snapshot-hash-stamp -a -z "$(diff ${CFG_BUILD_DIR}/src/compiler/rust-snapshot-hash-stamp ${CFG_SRC_DIR}/src/compiler/rust-snapshot-hash)" ]
then then