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.
This commit is contained in:
parent
98390b4568
commit
b037ca43df
@ -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}
|
||||
|
@ -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*
|
||||
|
@ -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}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user