diff options
| author | bors <bors@rust-lang.org> | 2016-12-23 02:35:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-23 02:35:45 +0000 |
| commit | c8e7ec4bfc71db24b4c3cb186480214bdc32a091 (patch) | |
| tree | 198c0a07b7ceee74eb94df7537e5da970c4f353c | |
| parent | a173778d1dab4960e46f3368390abf8a8fe25524 (diff) | |
| parent | 7d428b71dec973d6f53e16d18af7e2751321aafe (diff) | |
| download | rust-c8e7ec4bfc71db24b4c3cb186480214bdc32a091.tar.gz rust-c8e7ec4bfc71db24b4c3cb186480214bdc32a091.zip | |
Auto merge of #38562 - brson:rm-llvm-lock, r=brson
Delete the llvm submodule lockfile when configuring on the bots This should fix the periodic error that .git/modules/src/llvm/index.lock exists on the mac slaves.
| -rwxr-xr-x | configure | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/configure b/configure index e495c0d3abd..4f1e8f656ae 100755 --- a/configure +++ b/configure @@ -917,6 +917,18 @@ case $CFG_BUILD in esac putvar CFG_LLDB_PYTHON +# Do some sanity checks if running on buildbot +# (these env vars are set by rust-buildbot) +if [ -n "$RUST_DIST_SERVER" -a -n "$ALLOW_NONZERO_RLIMIT_CORE" ]; then + # Frequently the llvm submodule directory is broken by the build + # being killed + llvm_lock="${CFG_SRC_DIR}/.git/modules/src/llvm/index.lock" + if [ -e "$llvm_lock" ]; then + step_msg "removing $llvm_lock" + rm -f "$llvm_lock" + fi +fi + step_msg "looking for target specific programs" probe CFG_ADB adb |