diff options
| author | ru <ru@FreeBSD.org> | 2004-02-06 12:45:27 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-02-06 12:45:27 +0000 |
| commit | 0ff02d8b3375e71f9dc0bae4a6725b130c185a47 (patch) | |
| tree | e56a314914d215285d9840b6ffca9d890f7da02b /sys/boot/i386 | |
| parent | e954c4b75e64b8075a769fd9c556925cd34edf0b (diff) | |
| download | FreeBSD-src-0ff02d8b3375e71f9dc0bae4a6725b130c185a47.zip FreeBSD-src-0ff02d8b3375e71f9dc0bae4a6725b130c185a47.tar.gz | |
Only include ../Makefile.inc once in loader/Makefile.
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/Makefile.inc | 3 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc index f8c00de..f390a08 100644 --- a/sys/boot/i386/Makefile.inc +++ b/sys/boot/i386/Makefile.inc @@ -9,8 +9,7 @@ CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true .endif -.if defined(REALLY_AMD64) && !defined(__been_to_Makefile_inc) -__been_to_Makefile_inc= 1 +.if defined(REALLY_AMD64) CFLAGS+= -m32 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 670bd9f..4d87aa3 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -41,7 +41,7 @@ CFLAGS+= -DLOADER_GZIP_SUPPORT # Always add MI sources .PATH: ${.CURDIR}/../../common -.include <${.CURDIR}/../../common/Makefile.inc> +.include "${.CURDIR}/../../common/Makefile.inc" CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../.. -I. @@ -109,8 +109,6 @@ FILESDIR_loader.conf= /boot/defaults FILES+= ${.CURDIR}/loader.rc .endif -.include <${.CURDIR}/../Makefile.inc> - # Cannot use ${OBJS} above this line .include <bsd.prog.mk> |
