diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| m--------- | cargo | 0 | ||||
| -rw-r--r-- | src/bootstrap/channel.rs | 15 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 2 |
4 files changed, 20 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index a9867cbc11e..988ef66f8fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ matrix: SRC=. RUSTC_RETRY_LINKER_ON_SEGFAULT=1 SCCACHE_ERROR_LOG=/tmp/sccache.log - RUST_LOG=sccache + RUST_LOG=sccache=debug os: osx osx_image: xcode8.2 install: &osx_install_sccache > @@ -59,7 +59,7 @@ matrix: SRC=. RUSTC_RETRY_LINKER_ON_SEGFAULT=1 SCCACHE_ERROR_LOG=/tmp/sccache.log - RUST_LOG=sccache + RUST_LOG=sccache=debug os: osx osx_image: xcode8.2 install: *osx_install_sccache @@ -71,7 +71,7 @@ matrix: DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 SCCACHE_ERROR_LOG=/tmp/sccache.log - RUST_LOG=sccache + RUST_LOG=sccache=debug os: osx osx_image: xcode8.2 install: > @@ -84,7 +84,7 @@ matrix: DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 SCCACHE_ERROR_LOG=/tmp/sccache.log - RUST_LOG=sccache + RUST_LOG=sccache=debug os: osx osx_image: xcode8.2 install: *osx_install_sccache @@ -101,7 +101,7 @@ matrix: DEPLOY_ALT=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 SCCACHE_ERROR_LOG=/tmp/sccache.log - RUST_LOG=sccache + RUST_LOG=sccache=debug os: osx osx_image: xcode8.2 install: *osx_install_sccache diff --git a/cargo b/cargo -Subproject 5f3b9c4c6a7be1f177d6024cb83d150b6479148 +Subproject 4a3c0a63b07e9a4feb41cb11de37c92a09db5a6 diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index c126c076a3d..2607ce412f1 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -42,9 +42,22 @@ struct Info { impl GitInfo { pub fn new(dir: &Path) -> GitInfo { - if !dir.join(".git").is_dir() { + // See if this even begins to look like a git dir + if !dir.join(".git").exists() { return GitInfo { inner: None } } + + // Make sure git commands work + let out = Command::new("git") + .arg("rev-parse") + .current_dir(dir) + .output() + .expect("failed to spawn git"); + if !out.status.success() { + return GitInfo { inner: None } + } + + // Ok, let's scrape some info let ver_date = output(Command::new("git").current_dir(dir) .arg("log").arg("-1") .arg("--date=short") diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 618e4d67705..72aec15e532 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -232,7 +232,7 @@ impl Build { None => false, }; let rust_info = channel::GitInfo::new(&src); - let cargo_info = channel::GitInfo::new(&src.join("src/tools/cargo")); + let cargo_info = channel::GitInfo::new(&src.join("cargo")); Build { flags: flags, |