Re: -current build fails FreeBSD 4.x

[David Rhodus <sdrhodus@xxxxxxxxx>]

On Apr 7, 2005 10:06 PM, Chuck Tuffli <chuck_tuffli@xxxxxxxxxxx> wrote:
> Cross builds of DF on FreeBSD 4.x broke a couple of days ago (~ April 5th)

Can you try this patch ?

Index: sys/boot/ficl/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/ficl/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/boot/ficl/Makefile      5 Apr 2005 22:36:29 -0000       1.6
+++ sys/boot/ficl/Makefile      7 Apr 2005 22:30:05 -0000
@@ -15,7 +15,9 @@
 stack_protector.o: ../../libkern/stack_protector.c

 CLEANFILES=    softcore.c testmain testmain.o
+.if ${CCVER} == "gcc34"
 CFLAGS+=       -fno-stack-protector
+.endif
 CFLAGS+=       -ffreestanding
 .if ${MACHINE_ARCH} == "i386"
 CFLAGS+=       -mpreferred-stack-boundary=2
Index: sys/boot/i386/Makefile.inc
===================================================================
RCS file: /cvs/src/sys/boot/i386/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- sys/boot/i386/Makefile.inc  5 Apr 2005 22:36:31 -0000       1.6
+++ sys/boot/i386/Makefile.inc  7 Apr 2005 22:30:17 -0000
@@ -5,7 +5,9 @@

 LOADER_ADDRESS?=       0x200000
 CFLAGS+=               -ffreestanding -mpreferred-stack-boundary=2
-CFLAGS+=               -fno-stack-protector
+.if ${CCVER} == "gcc34"
+CFLAGS+=        -fno-stack-protector
+.endif

 .if ${MACHINE_ARCH} == "amd64"
 .MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true
Index: sys/conf/Makefile.i386
===================================================================
RCS file: /cvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.19
diff -u -r1.19 Makefile.i386
--- sys/conf/Makefile.i386      5 Apr 2005 22:36:33 -0000       1.19
+++ sys/conf/Makefile.i386      7 Apr 2005 22:31:14 -0000
@@ -48,7 +48,9 @@
 .endif
 # don't risk using the stack protector hacks for the kernel
 #
+.if ${CCVER} == "gcc34"
 COPTFLAGS+= -fno-stack-protector
+.endif
 # don't use -I- so we can use proper source-relative locality for local
 # includes
 INCLUDES= -nostdinc -I. -I$S
Index: lib/libstand/Makefile
===================================================================
RCS file: /cvs/src/lib/libstand/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- lib/libstand/Makefile       6 Apr 2005 03:36:27 -0000       1.8
+++ lib/libstand/Makefile       7 Apr 2005 22:31:59 -0000
@@ -15,7 +15,9 @@
 MAN=           libstand.3

 # Mostly OK, some of the libc imports are a bit noisy
-CFLAGS+=       -fno-stack-protector
+.if ${CCVER} == "gcc34"
+CFLAGS+=        -fno-stack-protector
+.endif
 CFLAGS+=       -Wall -ffreestanding

 .if ${MACHINE_ARCH} == "amd64"

-- 
                                            -David
                                            Steven David Rhodus
                                            <drhodus@xxxxxxxxxxx>