diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b9959684d..c5bdeddf9 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2011-04-04 Christopher Faylor <me.cygwin2011@cgf.cx> + + * Makefile.in: Move Makefile.common include earlier to fix problems with + relative ${srcdir} path which confuses make. + 2011-04-04 Corinna Vinschen <corinna@vinschen.de> Drop NT4 support. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 59abd356f..bb0b7336a 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -9,12 +9,19 @@ # details. # This makefile requires GNU make. +# +# Include common definitions for winsup directory +# The following assignments are "inputs" to Makefile.common +# +CC:=@CC@ +CC_FOR_TARGET:=$(CC) +CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@ +srcdir:=@srcdir@ +include ${srcdir}/../Makefile.common SHELL:=@SHELL@ -srcdir:=@srcdir@ objdir:=. -CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@ VPATH:=$(srcdir):$(CONFIG_DIR):$(srcdir)/regex:$(srcdir)/lib:$(srcdir)/libc target_alias:=@target_alias@ @@ -51,9 +58,6 @@ override INSTALL_DATA:=@INSTALL_DATA@ MT_SAFE:=@MT_SAFE@ DEFS:=@DEFS@ CCEXTRA:= -CC:=@CC@ -# FIXME: Which is it, CC or CC_FOR_TARGET? -CC_FOR_TARGET:=$(CC) CFLAGS=@CFLAGS@ override CFLAGS+=-MMD ${$(*F)_CFLAGS} -Werror -fmerge-constants -ftracer \ -mno-use-libstdc-wrappers $(CCEXTRA) @@ -73,10 +77,6 @@ OBJDUMP:=@OBJDUMP@ STRIP:=@STRIP@ LDSCRIPT:=cygwin.sc MKDIRP:=$(INSTALL) -m 755 -d -# -# Include common definitions for winsup directory -# -include $(srcdir)/../Makefile.common @SET_MAKE@ |