diff options
| author | obrien <obrien@FreeBSD.org> | 2003-02-26 06:18:52 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-02-26 06:18:52 +0000 |
| commit | de20c1280dec645de04b0dc982df31593e041218 (patch) | |
| tree | 28368b072f256ea2dbb3f2e23c56b68c6e8fa7be /sys/boot | |
| parent | 0f0fab8ca6f06726635690cafaa268b12439d162 (diff) | |
| download | FreeBSD-src-de20c1280dec645de04b0dc982df31593e041218.zip FreeBSD-src-de20c1280dec645de04b0dc982df31593e041218.tar.gz | |
Consistently use NOFORTH to control the usage of ficl.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/alpha/common/Makefile.common | 4 | ||||
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 7 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/Makefile | 7 | ||||
| -rw-r--r-- | sys/boot/ia64/ski/Makefile | 10 | ||||
| -rw-r--r-- | sys/boot/ia64/skiload/Makefile | 10 |
5 files changed, 17 insertions, 21 deletions
diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common index 85467a6..ac473a8 100644 --- a/sys/boot/alpha/common/Makefile.common +++ b/sys/boot/alpha/common/Makefile.common @@ -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 diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 5881829..e2f9a84 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -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 diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index 5881829..e2f9a84 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -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 diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile index bb4fc5c..8a374a1 100644 --- a/sys/boot/ia64/ski/Makefile +++ b/sys/boot/ia64/ski/Makefile @@ -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 diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile index bb4fc5c..8a374a1 100644 --- a/sys/boot/ia64/skiload/Makefile +++ b/sys/boot/ia64/skiload/Makefile @@ -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 |
