From owner-freebsd-current  Wed Jan  1 21:59:31 2003
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 02BB237B401
	for <freebsd-current@freebsd.org>; Wed,  1 Jan 2003 21:59:30 -0800 (PST)
Received: from mippet.ci.com.au (mippet.ci.com.au [192.65.182.30])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D8FC243EA9
	for <freebsd-current@freebsd.org>; Wed,  1 Jan 2003 21:59:28 -0800 (PST)
	(envelope-from rpp@ci.com.au)
Received: from mippet.ci.com.au (rpp@localhost [127.0.0.1])
	by mippet.ci.com.au (8.12.6/8.12.6/CE020811/c+m+l) with ESMTP id h025xN8C012879
	for <freebsd-current@freebsd.org>; Thu, 2 Jan 2003 16:59:24 +1100 (EST)
Received: (from rpp@localhost)
	by mippet.ci.com.au (8.12.6/8.12.6/Submit) id h025xN78012878
	for freebsd-current@freebsd.org; Thu, 2 Jan 2003 16:59:23 +1100 (EST)
Date: Thu, 2 Jan 2003 16:59:23 +1100
From: Richard Perini <rpp@ci.com.au>
To: freebsd-current@freebsd.org
Subject: Crossbuilding -current from -stable fails in boot2
Message-ID: <20030102055923.GA12588@mippet.ci.com.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG


When crossbuilding -current on a -stable machine, sys/boot/i386/boot2
fails during a make buildworld, the culprit appears to be  cpp on 
4-stable not grokking some of the CFLAGS arguments while cpp'ing boot1.s.  

A patch to fix the Makefile is below, not sure if its the desired way 
to fix?  If it is, could I ask that someone commit it please?

--
Richard Perini                                       Internet:  rpp@ci.com.au
Corinthian Engineering Pty Ltd                       PHONE:   +61 2 9906 4333
Sydney, Australia                                    FAX:     +61 2 9906 2464


--- Makefile.ORIG	Thu Jan  2 16:35:34 2003
+++ Makefile	Thu Jan  2 16:45:46 2003
@@ -45,6 +45,11 @@
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
 
+CPPFLAGS= -D${BOOT2_UFS} \
+	-I${.CURDIR}/../../common \
+	-I${.CURDIR}/../btx/lib -I. \
+	-Wall
+
 LDFLAGS=-nostdlib -static -N --gc-sections
 
 all: boot1 boot2
@@ -56,7 +61,7 @@
 	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
 
 boot1.o: boot1.s
-	${CPP} ${CFLAGS} ${.IMPSRC} | \
+	${CPP} ${CPPFLAGS} ${.IMPSRC} | \
 	    ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} -o ${.TARGET}
 
 boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message