security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Revert "build: Improve CFLAGS handling." 

This reverts commit 4b57359ef3.
This commit is contained in:
Justus Winter 2017-03-07 15:34:35 +01:00
parent 4b57359ef3
commit b71384c805
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -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