diff options
| author | jhb <jhb@FreeBSD.org> | 2000-01-28 15:19:22 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-01-28 15:19:22 +0000 |
| commit | ecc56c784b2880b40040e285d8c1a4ab80cc2f34 (patch) | |
| tree | b956114af21273f1587fde22e444c65dbb525b6c | |
| parent | 8b5a30bd76f4c041634e048c4187085db3122704 (diff) | |
| download | FreeBSD-src-ecc56c784b2880b40040e285d8c1a4ab80cc2f34.zip FreeBSD-src-ecc56c784b2880b40040e285d8c1a4ab80cc2f34.tar.gz | |
Allow for cdldr to be built in ${.OBJDIR}/../cdldr/cdldr instead of
only looking for it in ${.CURDIR}/../cdldr/cdldr. This fixes world.
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 3dd1d46..39c3c08 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -17,8 +17,8 @@ HAVE_PNP= yes HAVE_ISABUS= yes # Enable BootForth -BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 +#BOOT_FORTH= yes +#CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 .if exists(${.OBJDIR}/../../ficl/libficl.a) LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .else @@ -45,6 +45,13 @@ LIBSTAND= -lstand #LIBSTAND= ${.CURDIR}/../../../lib/libstand/libstand.a #CFLAGS+= -I${.CURDIR}/../../../lib/libstand/ +# where to get cdldr from +.if exists(${.OBJDIR}/../cdldr) +CDLDR= ${.OBJDIR}/../cdldr/cdldr +.else +CDLDR= ${.CURDIR}/../cdldr/cdldr +.endif + # BTX components .if exists(${.OBJDIR}/../btx) BTXDIR= ${.OBJDIR}/../btx @@ -52,7 +59,6 @@ BTXDIR= ${.OBJDIR}/../btx BTXDIR= ${.CURDIR}/../btx .endif BTXLDR= ${BTXDIR}/btxldr/btxldr -CDLDR= ${.CURDIR}/../cdldr/cdldr BTXKERN= ${BTXDIR}/btx/btx BTXCRT= ${BTXDIR}/lib/crt0.o CFLAGS+= -I${.CURDIR}/../btx/lib |
