diff options
author | Jakub Jelinek <jakub@redhat.com> | 2005-12-27 14:48:14 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2005-12-27 14:48:14 +0000 |
commit | 64cd3e83c9993f3c1a3c24ea3030a22ccf35e12d (patch) | |
tree | 8808fad08bb8677b0e0d2158c65096eae5484767 /Makeconfig | |
parent | e3173d2c996d8e30dfe44e9bf530881da6df6aaa (diff) |
Updated to fedora-glibc-20051227T1426
Diffstat (limited to 'Makeconfig')
-rw-r--r-- | Makeconfig | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Makeconfig b/Makeconfig index 45a970402e..f32a19eab6 100644 --- a/Makeconfig +++ b/Makeconfig @@ -552,10 +552,11 @@ endif # Extra flags to pass to GCC. ifeq ($(all-warnings),yes) -+gccwarn := -Wall -Wwrite-strings -Winline -Wstrict-prototypes -Wcast-qual -Wbad-function-cast -Wmissing-noreturn -Wmissing-prototypes -Wmissing-declarations -Wcomment -Wcomments -Wtrigraphs -Wsign-compare -Wfloat-equal -Wmultichar ++gccwarn := -Wall -Wwrite-strings -Winline -Wcast-qual -Wbad-function-cast -Wmissing-noreturn -Wmissing-prototypes -Wmissing-declarations -Wcomment -Wcomments -Wtrigraphs -Wsign-compare -Wfloat-equal -Wmultichar else -+gccwarn := -Wall -Wwrite-strings -Winline -Wstrict-prototypes ++gccwarn := -Wall -Wwrite-strings -Winline endif ++gccwarn-c = -Wstrict-prototypes # We do not depend on the address of constants in different files to be # actually different, so allow the compiler to merge them all. @@ -627,10 +628,10 @@ endif # $(+cflags) == "" # library source directory, in the include directory, and in the # current directory. # `+sysdep-includes' will be defined by Makerules. -+includes = -I$(..)include $(patsubst %/,-I%,$(..)) \ - $(libio-include) $(includes) \ - $(+sysdep-includes) $(sysincludes) -I. \ - $(patsubst %/,-I%,$(objpfx)) ++includes = -I$(..)include \ + $(patsubst %/,-I%,$(objpfx)) $(+sysdep-includes) \ + $(patsubst %/,-I%,$(..)) $(libio-include) $(includes) -I. \ + $(sysincludes) # Since libio has several internal header files, we use a -I instead # of many little headers in the include directory. @@ -647,8 +648,11 @@ CPPFLAGS = $($(subdir)-CPPFLAGS) $(+includes) $(defines) \ $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \ $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) override CFLAGS = -std=gnu99 \ - $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ - $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) + $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \ + $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \ + $(CFLAGS-$(@F)) +override CXXFLAGS = $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ + $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) # If everything is compiled with -fPIC (implicitly) we must tell this by # defining the PIC symbol. |