Put the commang line args last in gn_build.sh (#4594)

This lets the command line args override the defaults, since the last assignment wins.
project-chip · Feb 2, 2021 · 6b3293e · 6b3293e
1 parent 1e46379
commit 6b3293e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gn_build.sh b/gn_build.sh
@@ -73,14 +73,15 @@ echo gn args "$CHIP_ROOT/out/custom"
 echo ninja -C "$CHIP_ROOT/out/custom"
 
 extra_args=""
+user_args=""
 
 for arg; do
     case $arg in
         enable_qpg6100_builds=true)
             qpg6100_enabled=1
             ;;
     esac
-    extra_args+=" $arg"
+    user_args+=" $arg"
 done
 
 # Android SDK setup
@@ -136,8 +137,8 @@ echo
 
 _chip_banner "Build: GN configure"
 
-gn --root="$CHIP_ROOT" gen --check --fail-on-unused-args "$CHIP_ROOT/out/debug" --args='target_os="all"'"$extra_args"
-gn --root="$CHIP_ROOT" gen --check --fail-on-unused-args "$CHIP_ROOT/out/release" --args='target_os="all" is_debug=false'"$extra_args"
+gn --root="$CHIP_ROOT" gen --check --fail-on-unused-args "$CHIP_ROOT/out/debug" --args='target_os="all"'"$extra_args$user_args"
+gn --root="$CHIP_ROOT" gen --check --fail-on-unused-args "$CHIP_ROOT/out/release" --args='target_os="all" is_debug=false'"$extra_arg$user_args"
 
 _chip_banner "Build: Ninja build"