diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-11-09 22:35:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-11-09 22:35:41 +0000 |
| commit | 13748639c2b87530a8eac75419b9c6fce68f18a6 (patch) | |
| tree | 26997f8590a093d8e3cc184293baaf1b6165f61c /distrib/mvme68k | |
| parent | a0cff061b5c525b8f572253834bc7ee53a9d4f80 (diff) | |
Disable SRCLIBDIR crunchgen feature on gcc 3 platforms; gcc 3 collect2 does
not behave the way crunchgen expects it to. Will hopefully get fixed soon.
Discussed with guenther@
Diffstat (limited to 'distrib/mvme68k')
| -rw-r--r-- | distrib/mvme68k/ramdisk/Makefile | 7 | ||||
| -rw-r--r-- | distrib/mvme68k/ramdisk/Makefile.inc | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile index cd1cd5ba50f..6fdc2e3522a 100644 --- a/distrib/mvme68k/ramdisk/Makefile +++ b/distrib/mvme68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2013/10/15 22:46:52 deraadt Exp $ +# $OpenBSD: Makefile,v 1.32 2013/11/09 22:35:40 miod Exp $ TOP= ${.CURDIR}/.. @@ -78,7 +78,10 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all + ${MAKE} -f ${CBIN}.mk all + +#${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c +# ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u diff --git a/distrib/mvme68k/ramdisk/Makefile.inc b/distrib/mvme68k/ramdisk/Makefile.inc index 3e47252a4c5..114b5bd8ace 100644 --- a/distrib/mvme68k/ramdisk/Makefile.inc +++ b/distrib/mvme68k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.12 2013/10/15 22:46:52 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2013/11/09 22:35:40 miod Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -22,10 +22,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all - -#${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} -# crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} + ${MAKE} -f ${CBIN}.mk all #${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c # ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all |