Consistently use NOFORTH to control the usage of ficl.
This commit is contained in:
parent
fc8bcacd90
commit
4465e4794d
@ -10,15 +10,17 @@ SRCS+= main.c conf.c
|
||||
SRCS+= dev_net.c
|
||||
.endif
|
||||
|
||||
.if !defined(NOFORTH)
|
||||
# Enable BootForth
|
||||
BOOT_FORTH= yes
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha
|
||||
CFLAGS+= -DBOOT_FORTH
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha
|
||||
.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
|
||||
|
@ -12,18 +12,17 @@ STRIP= # We must not strip loader.efi at install time.
|
||||
SRCS+= main.c conf.c dev_net.c
|
||||
|
||||
CFLAGS+= -ffreestanding
|
||||
|
||||
.if !defined(NOFORTH)
|
||||
# Enable BootForth
|
||||
BOOT_FORTH= yes
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
|
||||
.if BOOT_FORTH
|
||||
CFLAGS+= -DBOOT_FORTH
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
|
||||
.if exists(${.OBJDIR}/../../ficl/libficl.a)
|
||||
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
|
||||
.else
|
||||
LIBFICL= ${.CURDIR}/../../ficl/libficl.a
|
||||
.endif
|
||||
.else
|
||||
LIBFICL=
|
||||
.endif
|
||||
|
||||
# where to get libstand from
|
||||
|
@ -12,18 +12,17 @@ STRIP= # We must not strip loader.efi at install time.
|
||||
SRCS+= main.c conf.c dev_net.c
|
||||
|
||||
CFLAGS+= -ffreestanding
|
||||
|
||||
.if !defined(NOFORTH)
|
||||
# Enable BootForth
|
||||
BOOT_FORTH= yes
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
|
||||
.if BOOT_FORTH
|
||||
CFLAGS+= -DBOOT_FORTH
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
|
||||
.if exists(${.OBJDIR}/../../ficl/libficl.a)
|
||||
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
|
||||
.else
|
||||
LIBFICL= ${.CURDIR}/../../ficl/libficl.a
|
||||
.endif
|
||||
.else
|
||||
LIBFICL=
|
||||
.endif
|
||||
|
||||
# where to get libstand from
|
||||
|
@ -9,20 +9,18 @@ BINDIR?= /boot
|
||||
|
||||
SRCS+= main.c conf.c
|
||||
|
||||
CFLAGS+= -ffreestanding
|
||||
|
||||
.if !defined(NOFORTH)
|
||||
# Enable BootForth
|
||||
BOOT_FORTH= yes
|
||||
CFLAGS+= -ffreestanding
|
||||
CFLAGS+= -g
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/ia64
|
||||
.if BOOT_FORTH
|
||||
CFLAGS+= -DBOOT_FORTH
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
|
||||
.if exists(${.OBJDIR}/../../ficl/libficl.a)
|
||||
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
|
||||
.else
|
||||
LIBFICL= ${.CURDIR}/../../ficl/libficl.a
|
||||
.endif
|
||||
.else
|
||||
LIBFICL=
|
||||
.endif
|
||||
|
||||
# where to get libstand from
|
||||
|
@ -9,20 +9,18 @@ BINDIR?= /boot
|
||||
|
||||
SRCS+= main.c conf.c
|
||||
|
||||
CFLAGS+= -ffreestanding
|
||||
|
||||
.if !defined(NOFORTH)
|
||||
# Enable BootForth
|
||||
BOOT_FORTH= yes
|
||||
CFLAGS+= -ffreestanding
|
||||
CFLAGS+= -g
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/ia64
|
||||
.if BOOT_FORTH
|
||||
CFLAGS+= -DBOOT_FORTH
|
||||
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
|
||||
.if exists(${.OBJDIR}/../../ficl/libficl.a)
|
||||
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
|
||||
.else
|
||||
LIBFICL= ${.CURDIR}/../../ficl/libficl.a
|
||||
.endif
|
||||
.else
|
||||
LIBFICL=
|
||||
.endif
|
||||
|
||||
# where to get libstand from
|
||||
|
Loading…
Reference in New Issue
Block a user