Use CPPFLAGS from configure.

diff --git a/ChangeLog b/ChangeLog
index c4ea055..0b723f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-19  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makeconfig (CPPFLAGS): Prepend $(CPPFLAGS-config).
+       * config.make.in (CPPFLAGS-config): New substituted variable.
+
 2011-09-15  Ulrich Drepper  <drepper@gmail.com>
 
        * sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c: New file.

diff --git a/Makeconfig b/Makeconfig
index 96aacda..8195245 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -703,7 +703,7 @@ libio-include = -I$(..)libio
 # Note that we can't use -std=* in CPPFLAGS, because it overrides
 # the implicit -lang-asm and breaks cpp behavior for .S files--notably
 # it causes cpp to stop predefining __ASSEMBLER__.
-CPPFLAGS = $($(subdir)-CPPFLAGS) $(+includes) $(defines) \
+CPPFLAGS = $(CPPFLAGS-config) $($(subdir)-CPPFLAGS) $(+includes) $(defines) \
           -include $(..)include/libc-symbols.h $(sysdep-CPPFLAGS) \
           $(CPPFLAGS-$(suffix $@)) \
           $(foreach lib,$(libof-$(basename $(@F))) \

diff --git a/config.make.in b/config.make.in
index cca3954..2181d05 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -106,6 +106,7 @@ CC = @CC@
 CXX = @CXX@
 BUILD_CC = @BUILD_CC@
 CFLAGS = @CFLAGS@
+CPPFLAGS-config = @CPPFLAGS@
 ASFLAGS-config = @ASFLAGS_config@
 AR = @AR@
 MAKEINFO = @MAKEINFO@