Bypass extra flags specified to m2n

1 files changed, 25 insertions, 20 deletions

diff --git a/m2n b/m2n
index 57be48a..c956cbb 100755
--- a/m2n
+++ b/m2n
@@ -6,36 +6,41 @@
 set -e
 
 kati_dir=$(cd $(dirname $0) && pwd)
-
+extra_flags=
 goma_flag=
 
-case "$1" in
-  --help)
-    cat - <<EOF
+while [ x"$1" != x"" ]; do
+  case "$1" in
+    --help)
+      cat - <<EOF
 Usage:
   m2n         # for full-build
   m2n --goma  # use goma. \$HOME/goma must exist
   m2n bionic  # works like mmm
 EOF
-    exit 1
-    ;;
-
-  --goma)
-    if [ ! -e $HOME/goma/goma_ctl.py ]; then
-      echo "$HOME/goma/goma_ctl.py should exist to use goma"
       exit 1
-    fi
-    $HOME/goma/goma_ctl.py ensure_start
-    goma_flag=--goma_dir=$HOME/goma
-    ;;
+      ;;
+
+    --goma)
+      if [ ! -e $HOME/goma/goma_ctl.py ]; then
+        echo "$HOME/goma/goma_ctl.py should exist to use goma"
+        exit 1
+      fi
+      $HOME/goma/goma_ctl.py ensure_start
+      goma_flag=--goma_dir=$HOME/goma
+      ;;
+
+    --*)
+      extra_flags+=" $1"
+      shift
+      ;;
 
-  *)
-    if [ x"$1" != x"" ]; then
+    *)
       target=$1
       shift
-    fi
-    ;;
-esac
+      ;;
+  esac
+done
 
 kati=${kati_dir}/kati
 
@@ -44,6 +49,6 @@ if [ x"${target}" != x"" ]; then
   echo ONE_SHOT_MAKEFILE=${ONE_SHOT_MAKEFILE}
 fi
 
-${kati} --ninja --ignore_optional_include=out/%.P ${goma_flag}
+${kati} --ninja --ignore_optional_include=out/%.P ${goma_flag} ${extra_flags}
 
 echo ninja.sh and build.ninja were generated, please run ./ninja.sh