* Makefile.in: Change the way that -f options are appended to CFLAGS, slightly.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4136f9e931134dab0522a4e1b0303205655ae1fb..3d2a5dcac6c49edccf6bb6ee34944d0c4b626f20 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-02  Christopher Faylor  <cgf@redhat.com>
+
+       * Makefile.in: Change the way that -f options are appended to CFLAGS,
+       slightly.
+
 2003-12-02  Christopher Faylor  <cgf@redhat.com>
 
        * fcntl.cc (_fcntl): Silence a compiler warning.

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 3a6f06233a5676c9ddbe39d7d96f6fb6e23288be..502934dd303635ef6b8ead4e27fcdbb5be6356be 100644 (file)
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -51,8 +51,8 @@ DEFS:=@DEFS@
 CC:=@CC@
 # FIXME: Which is it, CC or CC_FOR_TARGET?
 CC_FOR_TARGET:=$(CC)
-CFLAGS=@CFLAGS@ -fmerge-constants -ftracer
-override CFLAGS+=-MMD ${$(*F)_CFLAGS}
+CFLAGS=@CFLAGS@
+override CFLAGS+=-MMD ${$(*F)_CFLAGS} -fmerge-constants -ftracer
 CXX=@CXX@
 CXXFLAGS=@CXXFLAGS@