diff options
| author | obrien <obrien@FreeBSD.org> | 1999-12-22 01:56:57 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-12-22 01:56:57 +0000 |
| commit | e54126e848698eb39907dbd94e80e8a687352f80 (patch) | |
| tree | 31d25dc98db03fa6e2ebaa42e0e1303c912783a1 /gnu | |
| parent | b71f510e43dccdfc96aab3b0ec525b6ec0b23307 (diff) | |
| download | FreeBSD-src-e54126e848698eb39907dbd94e80e8a687352f80.zip FreeBSD-src-e54126e848698eb39907dbd94e80e8a687352f80.tar.gz | |
* Remove debugging cruft that accidently got committed.
* Support mixed OBJDIR handling such .a's are properly found with a mix of
obj subdirs both w/in and outside the source tree works. Requested by BDE.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/cc/Makefile.inc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index df074ba..fb844a3 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -4,8 +4,7 @@ # Sometimes this is .include'd several times... .if !defined(GCCDIR) -#GCCDIR= ${.CURDIR}/../../../../contrib/gcc -GCCDIR= /usr/src/contrib/gcc +GCCDIR= ${.CURDIR}/../../../../contrib/gcc .if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" GCC_ARCH=mips @@ -49,14 +48,22 @@ CFLAGS+= -I${.OBJDIR}/../cc_tools CFLAGS+= -I${.CURDIR}/../cc_tools CFLAGS+= -I${GCCDIR} -I${GCCDIR}/config -.if exists(${.OBJDIR}/../cc_int) -LIBDESTDIR= ${.OBJDIR}/.. +.if exists(${.OBJDIR}/../cc_drv) +LIBCC_DRV= ${.OBJDIR}/../cc_drv/libcc_drv.a +.else +LIBCC_DRV= ${.CURDIR}/../cc_drv/libcc_drv.a +.endif + +.if exists(${.OBJDIR}/../cc_fbsd) +LIBCC_FBSD= ${.OBJDIR}/../cc_fbsd/libcc_drv.a .else -LIBDESTDIR= ${.CURDIR}/.. +LIBCC_FBSD= ${.CURDIR}/../cc_fbsd/libcc_drv.a .endif -LIBCC_INT= ${LIBDESTDIR}/cc_int/libcc_int.a -LIBCC_DRV= ${LIBDESTDIR}/cc_drv/libcc_drv.a -LIBCC_FBSD= ${LIBDESTDIR}/cc_fbsd/libcc_fbsd.a +.if exists(${.OBJDIR}/../cc_int) +LIBCC_INT= ${.OBJDIR}/../cc_int/libcc_int.a +.else +LIBCC_INT= ${.CURDIR}/../cc_int/libcc_int.a +.endif .endif # !GCCDIR |
