svn commit: r267845 - in head/gnu/lib: csu libgcc libgcov

[Warner Losh]

Author: imp
Date: Tue Jun 24 22:15:27 2014
New Revision: 267845
URL: http://svnweb.freebsd.org/changeset/base/267845

Log:
  Make sure that the sub-makes for unwind.h start from the CURDIR
  (/usr/src) tree rather than the OBJDIR (/usr/obj) tree. This fixes
  broken incremental builds with the canonical MAKESYSPATH workaround
  of .../share/mk. This is a gross kludge.

Modified:
  head/gnu/lib/csu/Makefile
  head/gnu/lib/libgcc/Makefile
  head/gnu/lib/libgcov/Makefile

Modified: head/gnu/lib/csu/Makefile
==============================================================================
--- head/gnu/lib/csu/Makefile	Tue Jun 24 21:35:34 2014	(r267844)
+++ head/gnu/lib/csu/Makefile	Tue Jun 24 22:15:27 2014	(r267845)
@@ -73,7 +73,7 @@ crtendS.o:	${ENDSRC}
 
 CLEANFILES+=	tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h
 tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 realinstall:
 .for file in ${OBJS} ${SOBJS} ${TGTOBJS}

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Tue Jun 24 21:35:34 2014	(r267844)
+++ head/gnu/lib/libgcc/Makefile	Tue Jun 24 22:15:27 2014	(r267845)
@@ -317,7 +317,7 @@ ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS
 # Generated headers
 #
 ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 CLEANFILES += ${COMMONHDRS}
 CLEANFILES += cs-*.h option*

Modified: head/gnu/lib/libgcov/Makefile
==============================================================================
--- head/gnu/lib/libgcov/Makefile	Tue Jun 24 21:35:34 2014	(r267844)
+++ head/gnu/lib/libgcov/Makefile	Tue Jun 24 22:15:27 2014	(r267845)
@@ -46,7 +46,7 @@ COMMONHDRS=	tm.h tconfig.h gcov-iov.h op
 CLEANFILES+=	${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist
 
 ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 ${OBJS} beforedepend: ${COMMONHDRS}