summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-09-15 03:49:43 +0000
committerkato <kato@FreeBSD.org>1998-09-15 03:49:43 +0000
commit8c81f46123d257bd64ff2a626071e926a25b4adb (patch)
treeb08a6100d7d7839ab72105f4a2766bc0e2b40502
parent565c7a39295a15a9f420570d551c7bafbb3cccd7 (diff)
downloadFreeBSD-src-8c81f46123d257bd64ff2a626071e926a25b4adb.zip
FreeBSD-src-8c81f46123d257bd64ff2a626071e926a25b4adb.tar.gz
Sync with sys/i386/confMakefile.i386 revision 1.122.
-rw-r--r--sys/conf/Makefile.pc989
-rw-r--r--sys/pc98/conf/Makefile.pc989
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index a6a6cf6..de8f359 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.pc98,v 1.36 1998/09/01 07:18:09 kato Exp $
+# $Id: Makefile.pc98,v 1.37 1998/09/05 02:35:21 kato Exp $
#
# Makefile for FreeBSD
#
@@ -44,6 +44,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"
@@ -165,10 +168,10 @@ assym.s: genassym
genassym.o: ${I386}/i386/genassym.c
rm -f ./machine ; ln -s ${I386}/include ./machine
- ${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/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index a6a6cf6..de8f359 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.pc98,v 1.36 1998/09/01 07:18:09 kato Exp $
+# $Id: Makefile.pc98,v 1.37 1998/09/05 02:35:21 kato Exp $
#
# Makefile for FreeBSD
#
@@ -44,6 +44,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"
@@ -165,10 +168,10 @@ assym.s: genassym
genassym.o: ${I386}/i386/genassym.c
rm -f ./machine ; ln -s ${I386}/include ./machine
- ${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