diff options
| author | imp <imp@FreeBSD.org> | 2014-06-24 22:15:27 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-06-24 22:15:27 +0000 |
| commit | 33e60dabce67b0805a0f9dc2bc92b0a3156c82c6 (patch) | |
| tree | 88a3bcddaaf4433896a573c4fcf494f404bb9f89 /gnu | |
| parent | c7fb0c7414192b3fc56d9921ec9caeb8babe343f (diff) | |
| download | FreeBSD-src-33e60dabce67b0805a0f9dc2bc92b0a3156c82c6.zip FreeBSD-src-33e60dabce67b0805a0f9dc2bc92b0a3156c82c6.tar.gz | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/csu/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libgcov/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index 6ab5e87..2db69fb 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -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} diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 11af430..de80960 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -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* diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile index 5292f9f..e2b8074 100644 --- a/gnu/lib/libgcov/Makefile +++ b/gnu/lib/libgcov/Makefile @@ -46,7 +46,7 @@ COMMONHDRS= tm.h tconfig.h gcov-iov.h options.h 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} |
