diff options
author | peter <peter@FreeBSD.org> | 1999-11-18 09:54:11 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-11-18 09:54:11 +0000 |
commit | 7773468c080c012b350f05ea15b5355aa0147be3 (patch) | |
tree | a036954f05889afde8efbc0b8884c8274861a808 /sys | |
parent | 82f748df7aa366f08b2dcbef6020bc7baacd218f (diff) | |
download | FreeBSD-src-7773468c080c012b350f05ea15b5355aa0147be3.zip FreeBSD-src-7773468c080c012b350f05ea15b5355aa0147be3.tar.gz |
Hack: comment out the pull-in of src/sys/../share/mk/bsd.kern.mk as
that breaks if you try and compile a kernel before building world, as
is presently required to get past the signal changes. I don't
particularly like doing this, but at least it will mean that a 'make world'
will activate the gcc 2.95.2-specific option in bsd.kern.mk.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/Makefile.i386 | 10 | ||||
-rw-r--r-- | sys/conf/Makefile.powerpc | 10 | ||||
-rw-r--r-- | sys/i386/conf/Makefile.i386 | 10 |
3 files changed, 18 insertions, 12 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 42e8f61..eca1513 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -280,11 +280,13 @@ vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} -.if exists($S/../share/mk) -.include "$S/../share/mk/bsd.kern.mk" -.else +# Commented out for now pending a better solution. +# How do we pick up compiler version specific flags?? +#.if exists($S/../share/mk) +#.include "$S/../share/mk/bsd.kern.mk" +#.else .include <bsd.kern.mk> -.endif +#.endif %RULES diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 42e8f61..eca1513 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -280,11 +280,13 @@ vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} -.if exists($S/../share/mk) -.include "$S/../share/mk/bsd.kern.mk" -.else +# Commented out for now pending a better solution. +# How do we pick up compiler version specific flags?? +#.if exists($S/../share/mk) +#.include "$S/../share/mk/bsd.kern.mk" +#.else .include <bsd.kern.mk> -.endif +#.endif %RULES diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 42e8f61..eca1513 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -280,11 +280,13 @@ vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src vnode_if.o: ${NORMAL_C} -.if exists($S/../share/mk) -.include "$S/../share/mk/bsd.kern.mk" -.else +# Commented out for now pending a better solution. +# How do we pick up compiler version specific flags?? +#.if exists($S/../share/mk) +#.include "$S/../share/mk/bsd.kern.mk" +#.else .include <bsd.kern.mk> -.endif +#.endif %RULES |