From be357f37fe8da1eb916adac1146ef11becf43e0f Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 25 Nov 2013 14:08:21 -0800 Subject: [PATCH] mk: Don't error out on dirty submodules if `--disable-manage-submodules` is on --- configure | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 98b36b87201..a3beed29263 100755 --- a/configure +++ b/configure @@ -308,9 +308,12 @@ CFG_SELF=${CFG_SRC_DIR}$(basename $0) CFG_CONFIGURE_ARGS="$@" CFG_PATH=$PATH -if git status $CFG_SRC_DIR/src/compiler $CFG_SRC_DIR/src/support $CFG_SRC_DIR/src/platform \ - | grep -q 'modified:.*modified content'; then - err "Some submodule has a dirty working tree. See 'git status'." +if [ -n "$CFG_DISABLE_MANAGE_SUBMODULES" ] +then + if git status $CFG_SRC_DIR/src/compiler $CFG_SRC_DIR/src/support $CFG_SRC_DIR/src/platform \ + | grep -q 'modified:.*modified content'; then + err "Some submodule has a dirty working tree. See 'git status'." + fi fi OPTIONS=""