diff --git a/sys/boot/Makefile b/sys/boot/Makefile index ad7f32b25ea..5a04f78e8eb 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -4,7 +4,7 @@ .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true .endif -.if !defined(NOFORTH) +.if !defined(NOFORTH) && ${MACHINE_ARCH} != "powerpc" # Build the add-in FORTH interpreter SUBDIR+= ficl .endif diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile index 9cf054c3203..dfc52ee4e91 100644 --- a/sys/boot/powerpc/loader/Makefile +++ b/sys/boot/powerpc/loader/Makefile @@ -30,16 +30,16 @@ CFLAGS+= -DLOADER_DISK_SUPPORT CFLAGS+= -DLOADER_NET_SUPPORT .endif -.if !defined(NOFORTH) -# Enable BootForth -BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc -.if exists(${.OBJDIR}/../../ficl/libficl.a) -LIBFICL= ${.OBJDIR}/../../ficl/libficl.a -.else -LIBFICL= ${.CURDIR}/../../ficl/libficl.a -.endif -.endif +###.if !defined(NOFORTH) +#### Enable BootForth +###BOOT_FORTH= yes +###CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +###.if exists(${.OBJDIR}/../../ficl/libficl.a) +###LIBFICL= ${.OBJDIR}/../../ficl/libficl.a +###.else +###LIBFICL= ${.CURDIR}/../../ficl/libficl.a +###.endif +###.endif # Always add MI sources .PATH: ${.CURDIR}/../../common diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile index 9cf054c3203..dfc52ee4e91 100644 --- a/sys/boot/powerpc/ofw/Makefile +++ b/sys/boot/powerpc/ofw/Makefile @@ -30,16 +30,16 @@ CFLAGS+= -DLOADER_DISK_SUPPORT CFLAGS+= -DLOADER_NET_SUPPORT .endif -.if !defined(NOFORTH) -# Enable BootForth -BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc -.if exists(${.OBJDIR}/../../ficl/libficl.a) -LIBFICL= ${.OBJDIR}/../../ficl/libficl.a -.else -LIBFICL= ${.CURDIR}/../../ficl/libficl.a -.endif -.endif +###.if !defined(NOFORTH) +#### Enable BootForth +###BOOT_FORTH= yes +###CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +###.if exists(${.OBJDIR}/../../ficl/libficl.a) +###LIBFICL= ${.OBJDIR}/../../ficl/libficl.a +###.else +###LIBFICL= ${.CURDIR}/../../ficl/libficl.a +###.endif +###.endif # Always add MI sources .PATH: ${.CURDIR}/../../common