From cd97d47dbc69cec36b925435416b92ee9de745ff Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 28 Jan 2004 19:24:14 +0000 Subject: [PATCH] Undo some of the previously made changes to deal with cross build issues from 4.x and older versions of DFly. sys.mk should *NOT* include bsd.init.mk. That is way, way too early and blows up .inc files, e.g. such as those used by sys/boot. Rename .sub back to .inc in sys/boot (more on the way) so it will cross build from 4.x. --- share/mk/sys.mk | 3 +-- sys/boot/i386/{Makefile.sub => Makefile.inc} | 2 +- sys/boot/i386/btx/Makefile.inc | 4 ++-- sys/boot/i386/loader/Makefile | 4 ++-- sys/boot/{i386/Makefile.sub => pc32/Makefile.inc} | 2 +- sys/boot/pc32/btx/Makefile.inc | 4 ++-- sys/boot/pc32/loader/Makefile | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) copy sys/boot/i386/{Makefile.sub => Makefile.inc} (83%) rename sys/boot/{i386/Makefile.sub => pc32/Makefile.inc} (83%) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 2db898bef2..923affa5e0 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,6 +1,6 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 # $FreeBSD: src/share/mk/sys.mk,v 1.45.2.6 2002/12/23 16:33:37 ru Exp $ -# $DragonFly: src/share/mk/sys.mk,v 1.3 2004/01/26 16:13:49 joerg Exp $ +# $DragonFly: src/share/mk/sys.mk,v 1.4 2004/01/28 19:24:09 dillon Exp $ unix ?= We run FreeBSD, not UNIX. @@ -249,7 +249,6 @@ __MAKE_CONF?=/etc/make.conf .include "${__MAKE_CONF}" .endif -.include .include .if exists(/etc/make.conf.local) diff --git a/sys/boot/i386/Makefile.sub b/sys/boot/i386/Makefile.inc similarity index 83% copy from sys/boot/i386/Makefile.sub copy to sys/boot/i386/Makefile.inc index 41423b8448..8927210630 100644 --- a/sys/boot/i386/Makefile.sub +++ b/sys/boot/i386/Makefile.inc @@ -1,7 +1,7 @@ # Common defines for all of /sys/boot/i386/ # # $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.4 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/i386/Attic/Makefile.sub,v 1.1 2004/01/26 19:49:31 joerg Exp $ +# $DragonFly: src/sys/boot/i386/Attic/Makefile.inc,v 1.5 2004/01/28 19:24:11 dillon Exp $ LOADER_ADDRESS?= 0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 diff --git a/sys/boot/i386/btx/Makefile.inc b/sys/boot/i386/btx/Makefile.inc index 3f5c660946..7ffa5c80d6 100644 --- a/sys/boot/i386/btx/Makefile.inc +++ b/sys/boot/i386/btx/Makefile.inc @@ -1,3 +1,3 @@ # $FreeBSD: src/sys/boot/i386/btx/Makefile.inc,v 1.1 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/i386/btx/Attic/Makefile.inc,v 1.2 2004/01/26 19:49:32 joerg Exp $ -.include "../Makefile.sub" +# $DragonFly: src/sys/boot/i386/btx/Attic/Makefile.inc,v 1.3 2004/01/28 19:24:12 dillon Exp $ +.include "../Makefile.inc" diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 26e8adc288..9f8f8a063f 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.66 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/i386/loader/Attic/Makefile,v 1.4 2004/01/26 19:49:32 joerg Exp $ +# $DragonFly: src/sys/boot/i386/loader/Attic/Makefile,v 1.5 2004/01/28 19:24:14 dillon Exp $ PROG= loader STRIP= @@ -110,7 +110,7 @@ FILESDIR_loader.conf= /boot/defaults FILES+= ${.CURDIR}/loader.rc .endif -.include "../Makefile.sub" +.include "../Makefile.inc" # Cannot use ${OBJS} above this line .include diff --git a/sys/boot/i386/Makefile.sub b/sys/boot/pc32/Makefile.inc similarity index 83% rename from sys/boot/i386/Makefile.sub rename to sys/boot/pc32/Makefile.inc index 41423b8448..f3bda602c1 100644 --- a/sys/boot/i386/Makefile.sub +++ b/sys/boot/pc32/Makefile.inc @@ -1,7 +1,7 @@ # Common defines for all of /sys/boot/i386/ # # $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.4 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/i386/Attic/Makefile.sub,v 1.1 2004/01/26 19:49:31 joerg Exp $ +# $DragonFly: src/sys/boot/pc32/Makefile.inc,v 1.5 2004/01/28 19:24:11 dillon Exp $ LOADER_ADDRESS?= 0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 diff --git a/sys/boot/pc32/btx/Makefile.inc b/sys/boot/pc32/btx/Makefile.inc index a642aeed23..e8bd31fd16 100644 --- a/sys/boot/pc32/btx/Makefile.inc +++ b/sys/boot/pc32/btx/Makefile.inc @@ -1,3 +1,3 @@ # $FreeBSD: src/sys/boot/i386/btx/Makefile.inc,v 1.1 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/pc32/btx/Makefile.inc,v 1.2 2004/01/26 19:49:32 joerg Exp $ -.include "../Makefile.sub" +# $DragonFly: src/sys/boot/pc32/btx/Makefile.inc,v 1.3 2004/01/28 19:24:12 dillon Exp $ +.include "../Makefile.inc" diff --git a/sys/boot/pc32/loader/Makefile b/sys/boot/pc32/loader/Makefile index d3a80a8ca5..ca98837081 100644 --- a/sys/boot/pc32/loader/Makefile +++ b/sys/boot/pc32/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.66 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/pc32/loader/Makefile,v 1.4 2004/01/26 19:49:32 joerg Exp $ +# $DragonFly: src/sys/boot/pc32/loader/Makefile,v 1.5 2004/01/28 19:24:14 dillon Exp $ PROG= loader STRIP= @@ -110,7 +110,7 @@ FILESDIR_loader.conf= /boot/defaults FILES+= ${.CURDIR}/loader.rc .endif -.include "../Makefile.sub" +.include "../Makefile.inc" # Cannot use ${OBJS} above this line .include -- 2.41.0