summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1998-09-14 11:32:17 +0000
committerjkh <jkh@FreeBSD.org>1998-09-14 11:32:17 +0000
commit6b2e341178d2c388cbe96252645a3e1219d6c6d6 (patch)
treea92b6136001318de50f81fa3a7aea98e2ca13ad1
parent01222bd1c52e1625a436804b8b9d6d98fa60b816 (diff)
downloadFreeBSD-src-6b2e341178d2c388cbe96252645a3e1219d6c6d6.zip
FreeBSD-src-6b2e341178d2c388cbe96252645a3e1219d6c6d6.tar.gz
Decouple genassym flags from CFLAGS.
Submitted by: jhay
-rw-r--r--sys/conf/Makefile.i3869
-rw-r--r--sys/conf/Makefile.powerpc9
-rw-r--r--sys/i386/conf/Makefile.i3869
3 files changed, 18 insertions, 9 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 942490c..e456c3c 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.120 1998/09/01 00:11:02 jb Exp $
+# $Id: Makefile.i386,v 1.121 1998/09/03 20:58:34 nsouch Exp $
#
# Makefile for FreeBSD
#
@@ -41,6 +41,9 @@ INCLUDES+= -I/usr/include
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+# Use the system default for genassym
+GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+
# Select the correct set of tools. Can't set OBJFORMAT here because it
# doesn't get exported into the environment.
.if ${KERNFORMAT} == "elf"
@@ -161,10 +164,10 @@ assym.s: genassym
./genassym >assym.s
genassym.o: ${I386}/i386/genassym.c
- ${CC} -c ${CFLAGS} -UKERNEL ${I386}/i386/genassym.c
+ ${CC} -c ${GEN_CFLAGS} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o
- ${CC} ${CFLAGS} genassym.o -o ${.TARGET}
+ ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
${SYSTEM_OBJS}: opt_global.h
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 942490c..e456c3c 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.120 1998/09/01 00:11:02 jb Exp $
+# $Id: Makefile.i386,v 1.121 1998/09/03 20:58:34 nsouch Exp $
#
# Makefile for FreeBSD
#
@@ -41,6 +41,9 @@ INCLUDES+= -I/usr/include
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+# Use the system default for genassym
+GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+
# Select the correct set of tools. Can't set OBJFORMAT here because it
# doesn't get exported into the environment.
.if ${KERNFORMAT} == "elf"
@@ -161,10 +164,10 @@ assym.s: genassym
./genassym >assym.s
genassym.o: ${I386}/i386/genassym.c
- ${CC} -c ${CFLAGS} -UKERNEL ${I386}/i386/genassym.c
+ ${CC} -c ${GEN_CFLAGS} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o
- ${CC} ${CFLAGS} genassym.o -o ${.TARGET}
+ ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
${SYSTEM_OBJS}: opt_global.h
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 942490c..e456c3c 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.120 1998/09/01 00:11:02 jb Exp $
+# $Id: Makefile.i386,v 1.121 1998/09/03 20:58:34 nsouch Exp $
#
# Makefile for FreeBSD
#
@@ -41,6 +41,9 @@ INCLUDES+= -I/usr/include
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+# Use the system default for genassym
+GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+
# Select the correct set of tools. Can't set OBJFORMAT here because it
# doesn't get exported into the environment.
.if ${KERNFORMAT} == "elf"
@@ -161,10 +164,10 @@ assym.s: genassym
./genassym >assym.s
genassym.o: ${I386}/i386/genassym.c
- ${CC} -c ${CFLAGS} -UKERNEL ${I386}/i386/genassym.c
+ ${CC} -c ${GEN_CFLAGS} -UKERNEL ${I386}/i386/genassym.c
genassym: genassym.o
- ${CC} ${CFLAGS} genassym.o -o ${.TARGET}
+ ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
${SYSTEM_OBJS}: opt_global.h
OpenPOWER on IntegriCloud