dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Brian Anderson 2016-12-22 22:00:21 +00:00
parent 17d873c2db
commit 7d428b71de
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -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