commit aa2976249b738b029b461ce7ba372d5b8b8e8c6b
author Andrew Jeffery <andrew@aj.id.au> Tue Mar 17 16:59:59 2020 +1030
committer Andrew Jeffery <andrew@aj.id.au> Wed Mar 18 22:52:57 2020 +0000
tree 62dd04143129da1acb32ca1d53b41f9e0c7c152d
parent d09253f001ed28c555e35ea688bb1bd5678c6777

bootstrap: Cleanup FLAGS definition

The reorganisation is partly to avoid long lines but also to provide a
clear machanism for adding further flags and an easy approach to
disabling flags if desired (by commenting out the line).

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I5310d166086c5d7f028be4e8c59c8db6b079a488

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index ac02a30..cf2cd9b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,7 +4,6 @@
 
 autoreconf -f -i
 
-
 BOOTSTRAP_MODE=""
 
 if [ $# -gt 0 ];
@@ -15,10 +14,12 @@
 
 case "${BOOTSTRAP_MODE}" in
     dev)
-        FLAGS="-fsanitize=address,leak,undefined -Wformat -Werror=format-security -Werror=array-bounds -ggdb"
+        FLAGS="-Wformat -Werror=format-security"
+        FLAGS="${FLAGS} -Werror=array-bounds"
+        FLAGS="${FLAGS} -fsanitize=address,leak,undefined"
+        FLAGS="${FLAGS} -ggdb"
         ./configure \
             CFLAGS="${FLAGS}" \
-            CXXFLAGS="${FLAGS}" \
             --enable-code-coverage \
             "$@"
         ;;