summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/Makefile.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4136f9e93..3d2a5dcac 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
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.
2003-12-02 Pierre Humblet <pierre.humblet@ieee.org>
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 3a6f06233..502934dd3 100644
--- 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@