mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-21 22:34:05 +00:00
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:
parent
17d873c2db
commit
7d428b71de
12
configure
vendored
12
configure
vendored
@ -917,6 +917,18 @@ case $CFG_BUILD in
|
|||||||
esac
|
esac
|
||||||
putvar CFG_LLDB_PYTHON
|
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"
|
step_msg "looking for target specific programs"
|
||||||
|
|
||||||
probe CFG_ADB adb
|
probe CFG_ADB adb
|
||||||
|
Loading…
Reference in New Issue
Block a user