mirror of
git://git.gnupg.org/gnupg.git
synced 2025-06-14 18:31:03 +02:00
Revert "build: Improve CFLAGS handling."
This reverts commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4.
This commit is contained in:
parent
4b57359ef3
commit
b71384c805
16
configure.ac
16
configure.ac
@ -85,14 +85,12 @@ AB_INIT
|
|||||||
|
|
||||||
AC_GNU_SOURCE
|
AC_GNU_SOURCE
|
||||||
|
|
||||||
# Before we do anything with the C compiler, we first split the user's
|
# Before we do anything with the C compiler, we first save the user's
|
||||||
# CFLAGS into two lists, one containing all flags matching '-Werror',
|
# CFLAGS (they are restored at the end of the configure script). This
|
||||||
# and the other one containing all remaing flags. They are recombined
|
# is because some configure checks don't work with -Werror, but we'd
|
||||||
# at the end of the configure script. This is because some configure
|
# like to use -Werror with our build.
|
||||||
# checks don't work with -Werror, but we'd like to use -Werror with
|
CFLAGS_orig=$CFLAGS
|
||||||
# our build.
|
CFLAGS=
|
||||||
CFLAGS_werror="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -e -Werror | tr '\n' ' ')"
|
|
||||||
CFLAGS="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -v -e -Werror | tr '\n' ' ')"
|
|
||||||
|
|
||||||
# Some status variables.
|
# Some status variables.
|
||||||
have_gpg_error=no
|
have_gpg_error=no
|
||||||
@ -1678,7 +1676,7 @@ fi
|
|||||||
#
|
#
|
||||||
# Add user CFLAGS.
|
# Add user CFLAGS.
|
||||||
#
|
#
|
||||||
CFLAGS="$CFLAGS $CFLAGS_werror"
|
CFLAGS="$CFLAGS $CFLAGS_orig"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Decide what to build
|
# Decide what to build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user