Re: cant buildworlnd on FreeBSD 4.9-RELEASE

[Joerg Sonnenberger <joerg@xxxxxxxxxxxxxxxxx>]

On Thu, Feb 05, 2004 at 06:09:52PM +0300, Sergey Matveychuk wrote:
> >What is strange is that it is in stage 4 and should therefore use the
> >DF cross system compiler. Can you send me the output of
> >${OBJDIR}/i386/usr/libexec/gcc2/cc -dumpspecs with the current sources?
> >May be I can trace it down. Also the build log would be useful.
> >Either put on the web somewhere or send it as private mail compressed
> >with bzip2 ;-)
> 
> No, it's not in stage4. It's in stage builds a crosscompiler tools (or 
> so). ${OBJDIR}/i386/usr/libexec/gcc2/cc is clean yet.

OK. Don't have a FreeBSD here to test it myself. Give the attached patch
a try. 

Joerg

> ---
> Sem.

Index: Makefile.inc1
===================================================================
RCS file: /cvs/src/Makefile.inc1,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile.inc1
--- Makefile.inc1	2 Feb 2004 05:43:07 -0000	1.20
+++ Makefile.inc1	5 Feb 2004 15:50:32 -0000
@@ -187,7 +187,8 @@
 # bootstrap-tool stage
 BMAKEENV=	MAKEOBJDIRPREFIX=${WORLDTMP} \
 		DESTDIR= \
-		INSTALL="sh ${.CURDIR}/tools/install.sh"
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		CC="${CC} -D__DragonFly__=1" CXX="${CXX} -D__DragonFly__=1"
 BMAKE=		${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
 		-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
 		-DNO_WERROR
@@ -195,7 +196,8 @@
 # build-tool stage
 TMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		DESTDIR= \
-		INSTALL="sh ${.CURDIR}/tools/install.sh"
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		CC="${CC} -D__DragonFly__=1" CXX="${CXX} -D__DragonFly__=1"
 TMAKE=		${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING
 
 # cross-tool stage