Skip to content

Commit c8e7ec4

Browse files
committedDec 23, 2016
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.
2 parents a173778 + 7d428b7 commit c8e7ec4

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed
 

‎configure

+12
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,18 @@ case $CFG_BUILD in
917917
esac
918918
putvar CFG_LLDB_PYTHON
919919

920+
# Do some sanity checks if running on buildbot
921+
# (these env vars are set by rust-buildbot)
922+
if [ -n "$RUST_DIST_SERVER" -a -n "$ALLOW_NONZERO_RLIMIT_CORE" ]; then
923+
# Frequently the llvm submodule directory is broken by the build
924+
# being killed
925+
llvm_lock="${CFG_SRC_DIR}/.git/modules/src/llvm/index.lock"
926+
if [ -e "$llvm_lock" ]; then
927+
step_msg "removing $llvm_lock"
928+
rm -f "$llvm_lock"
929+
fi
930+
fi
931+
920932
step_msg "looking for target specific programs"
921933

922934
probe CFG_ADB adb

0 commit comments

Comments
 (0)
Please sign in to comment.