d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only include ../Makefile.inc once in loader/Makefile.

Browse Source
This commit is contained in:
Ruslan Ermilov 2004-02-06 12:45:27 +00:00
parent fb94df0e92
commit 742816a54a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/boot/i386/Makefile.inc
View File

@ -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

4
sys/boot/i386/loader/Makefile
View File

@ -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>