diff options
| author | Justus Winter <justus@g10code.com> | 2017-03-07 15:34:35 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2017-03-07 15:34:35 +0100 |
| commit | b71384c8054ce2f245ccfae02b8ee81e1adfc512 (patch) | |
| tree | 3b701b0266fa358921ebaf331c2b5f07514da808 /configure.ac | |
| parent | build: Improve CFLAGS handling. (diff) | |
| download | gnupg2-b71384c8054ce2f245ccfae02b8ee81e1adfc512.tar.xz gnupg2-b71384c8054ce2f245ccfae02b8ee81e1adfc512.zip | |
Revert "build: Improve CFLAGS handling."
This reverts commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 8e2fc4348..6d35450b0 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 |