diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-04-18 18:13:58 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-04-18 18:13:58 +0000 |
| commit | 0cc8656eb968e6b5a098f6307911006932447c3c (patch) | |
| tree | 0df5667ab90d3c8696803c12426cb486102d64b6 /gnu/lib/libgcc | |
| parent | 3842fa6c223b41ebdb85fff66386e94652bf4aad (diff) | |
| download | FreeBSD-src-0cc8656eb968e6b5a098f6307911006932447c3c.zip FreeBSD-src-0cc8656eb968e6b5a098f6307911006932447c3c.tar.gz | |
Follow-up r297842: Rework header generation to fix always rebuilding.
This reworks the handling of common headers to just include the needed
logic rather than invoke MAKE. This avoids the problem listed in r297842
and avoids other dependency tracking issues.
Pointyhat to: bdrewery
Reported by: Nikolai Lifanov <lifanov@mail.lifanov.com>
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'gnu/lib/libgcc')
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 643d10d..10e1c0f 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -3,6 +3,7 @@ PACKAGE= clibs GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs +CCDIR= ${.CURDIR}/../../usr.bin/cc COMPILERRTDIR= ${.CURDIR}/../../../contrib/compiler-rt UNWINDINCDIR= ${.CURDIR}/../../../contrib/llvm/projects/libunwind/include UNWINDSRCDIR= ${.CURDIR}/../../../contrib/llvm/projects/libunwind/src @@ -17,7 +18,8 @@ SHLIBDIR?= /lib # MK_SSP= no -.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" +.include "${CCDIR}/Makefile.tgt" +.include "${CCDIR}/cc_tools/Makefile.hdrs" .if ${TARGET_CPUARCH} == "arm" CFLAGS+= -DTARGET_ARM_EABI @@ -29,7 +31,7 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \ -DHAVE_GTHR_DEFAULT \ -I${GCCLIB}/include \ -I${GCCDIR}/config -I${GCCDIR} -I. \ - -I${.CURDIR}/../../usr.bin/cc/cc_tools + -I${CCDIR}/cc_tools LDFLAGS+= -nodefaultlibs LIBADD+= c @@ -340,13 +342,6 @@ ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS} .endfor -#----------------------------------------------------------------------- -# -# Generated headers -# -${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile .PHONY - (cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}) - CLEANFILES += ${COMMONHDRS} CLEANFILES += cs-*.h option* |
