author | Horst Kronstorfer <horst.kronstorfer@aon.at> |
Mon Jan 03 19:07:34 2011 +0100 (2011-01-03) | |
branch | 1.9 |
changeset 2255 | 78fe1a2a2bac |
permissions | -rw-r--r-- |
1 Respect environment CPPFLAGS when we run ./configure so we can inject
2 random -D things without having to set CFLAGS/ASFLAGS
4 diff -durN glibc-2.10.1.orig/Makeconfig glibc-2.10.1/Makeconfig
5 --- glibc-2.10.1.orig/Makeconfig 2009-05-09 23:57:56.000000000 +0200
6 +++ glibc-2.10.1/Makeconfig 2009-11-13 00:49:41.000000000 +0100
7 @@ -672,6 +672,7 @@
8 $(foreach lib,$(libof-$(basename $(@F))) \
9 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
10 $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
11 +CPPFLAGS += $(CPPFLAGS-config)
12 override CFLAGS = -std=gnu99 $(gnu89-inline-CFLAGS) \
13 $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
14 $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
15 diff -durN glibc-2.10.1.orig/config.make.in glibc-2.10.1/config.make.in
16 --- glibc-2.10.1.orig/config.make.in 2009-05-09 17:59:38.000000000 +0200
17 +++ glibc-2.10.1/config.make.in 2009-11-13 00:49:41.000000000 +0100
18 @@ -103,6 +103,7 @@
19 CXX = @CXX@
20 BUILD_CC = @BUILD_CC@
21 CFLAGS = @CFLAGS@
22 +CPPFLAGS-config = @CPPFLAGS@
23 ASFLAGS-config = @ASFLAGS_config@
24 AR = @AR@
25 RANLIB = @RANLIB@