Review at  https://gerrit.osmocom.org/4859

build, jenkins: use only CPPFLAGS, not CFLAGS as well

According to
https://stackoverflow.com/questions/2754966/cflags-vs-cppflags?answertab=votes#tab-top
using CPPFLAGS is sufficient and we don't need to set CFLAGS as well.

Looking at jenkins 'make V=1' output indeed shows that we pass various flags 
twice.

Drop CFLAGS, keep only CPPFLAGS, for sanitize, -Wfoo, -DFOO args, in
configure.ac and jenkins.sh.

Change-Id: If94318efa6d4e38d1c97c523ebcc000fdc14ce32
---
M configure.ac
M contrib/jenkins.sh
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/4859/1

diff --git a/configure.ac b/configure.ac
index a8c1d2e..4bf2459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,11 +262,9 @@
        [sanitize=$enableval], [sanitize="no"])
 if test x"$sanitize" = x"yes"
 then
-       CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined"
        CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
 fi
 
-CFLAGS="$CFLAGS -DBUILDING_LIBOSMOCORE -Wall"
 CPPFLAGS="$CPPFLAGS -DBUILDING_LIBOSMOCORE -Wall"
 
 AC_ARG_ENABLE(simd,
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 5798c95..795fa26 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,7 +15,7 @@
 
     prep_build "$src_dir" "$build_dir"
 
-    "$src_dir"/configure --enable-static $ENABLE_SANITIZE CFLAGS="-Werror" 
CPPFLAGS="-Werror"
+    "$src_dir"/configure --enable-static $ENABLE_SANITIZE CPPFLAGS="-Werror"
     $MAKE $PARALLEL_MAKE check \
         || cat-testlogs.sh
 }

-- 
To view, visit https://gerrit.osmocom.org/4859
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If94318efa6d4e38d1c97c523ebcc000fdc14ce32
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>

Reply via email to