]>
Commit | Line | Data |
---|---|---|
12788f63 MT |
1 | 2011-08-17 Ulrich Drepper <drepper@gmail.com> |
2 | ||
3 | * Makeconfig (override CFLAGS): Add library-specific CFLAGS. | |
4 | * resolv/Makefile: Define CFLAGS-libresolv. | |
5 | ||
6 | Index: glibc-2.12-2-gc4ccff1/Makeconfig | |
7 | =================================================================== | |
8 | --- glibc-2.12-2-gc4ccff1.orig/Makeconfig | |
9 | +++ glibc-2.12-2-gc4ccff1/Makeconfig | |
10 | @@ -700,7 +700,9 @@ CPPFLAGS = $($(subdir)-CPPFLAGS) $(+incl | |
11 | override CFLAGS = -std=gnu99 $(gnu89-inline-CFLAGS) \ | |
12 | $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \ | |
13 | $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \ | |
14 | - $(CFLAGS-$(@F)) | |
15 | + $(CFLAGS-$(@F)) \ | |
16 | + $(foreach lib,$(libof-$(basename $(@F))) \ | |
17 | + $(libof-$(<F)) $(libof-$(@F)),$(CFLAGS-$(lib))) | |
18 | override CXXFLAGS = $(c++-sysincludes) \ | |
19 | $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ | |
20 | $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) | |
21 | Index: glibc-2.12-2-gc4ccff1/resolv/Makefile | |
22 | =================================================================== | |
23 | --- glibc-2.12-2-gc4ccff1.orig/resolv/Makefile | |
24 | +++ glibc-2.12-2-gc4ccff1/resolv/Makefile | |
25 | @@ -76,6 +76,9 @@ CPPFLAGS += -Dgethostbyname=res_gethostb | |
26 | -Dgetnetbyname=res_getnetbyname \ | |
27 | -Dgetnetbyaddr=res_getnetbyaddr | |
28 | ||
29 | +ifeq (yes,$(have-ssp)) | |
30 | +CFLAGS-libresolv += -fstack-protector | |
31 | +endif | |
32 | CFLAGS-res_hconf.c = -fexceptions | |
33 | CFLAGS-res_send.c += -fno-strict-aliasing | |
34 |