[Pkg-gnupg-commit] [gnupg2] 39/124: Revert "build: Improve CFLAGS handling."
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Apr 5 15:55:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit b71384c8054ce2f245ccfae02b8ee81e1adfc512
Author: Justus Winter <justus at g10code.com>
Date: Tue Mar 7 15:34:35 2017 +0100
Revert "build: Improve CFLAGS handling."
This reverts commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4.
---
configure.ac | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8e2fc43..6d35450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,14 +85,12 @@ AB_INIT
AC_GNU_SOURCE
-# Before we do anything with the C compiler, we first split the user's
-# CFLAGS into two lists, one containing all flags matching '-Werror',
-# and the other one containing all remaing flags. They are recombined
-# at the end of the configure script. This is because some configure
-# checks don't work with -Werror, but we'd like to use -Werror with
-# our build.
-CFLAGS_werror="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -e -Werror | tr '\n' ' ')"
-CFLAGS="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -v -e -Werror | tr '\n' ' ')"
+# Before we do anything with the C compiler, we first save the user's
+# CFLAGS (they are restored at the end of the configure script). This
+# is because some configure checks don't work with -Werror, but we'd
+# like to use -Werror with our build.
+CFLAGS_orig=$CFLAGS
+CFLAGS=
# Some status variables.
have_gpg_error=no
@@ -1678,7 +1676,7 @@ fi
#
# Add user CFLAGS.
#
-CFLAGS="$CFLAGS $CFLAGS_werror"
+CFLAGS="$CFLAGS $CFLAGS_orig"
#
# Decide what to build
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list