summaryrefslogtreecommitdiffstats
path: root/sys/conf/Makefile.i386
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1994-10-02 21:50:51 +0000
committerphk <phk@FreeBSD.org>1994-10-02 21:50:51 +0000
commit7dd02d260797fe821b4fc6630d4eeaa4a10ba1e0 (patch)
treeb82621041a71e5c33cf87f67a421d10cff42776c /sys/conf/Makefile.i386
parent32fd2ea330b0903f0a081b5e8942f505b79d4054 (diff)
downloadFreeBSD-src-7dd02d260797fe821b4fc6630d4eeaa4a10ba1e0.zip
FreeBSD-src-7dd02d260797fe821b4fc6630d4eeaa4a10ba1e0.tar.gz
In case CWARNFLAGS and COPTFLAGS are already defined (from /etc/make.conf
for instance), don't nuke them.
Diffstat (limited to 'sys/conf/Makefile.i386')
-rw-r--r--sys/conf/Makefile.i3866
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 75337fa..70eacf4 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.40 1994/10/01 02:55:56 davidg Exp $
+# $Id: Makefile.i386,v 1.41 1994/10/01 21:43:24 rgrimes Exp $
#
# Makefile for FreeBSD
#
@@ -42,7 +42,9 @@ S= ../..
.endif
I386= ${S}/i386
+.if !defined(CWARNFLAGS)
CWARNFLAGS=-W -Wreturn-type -Wcomment -Wredundant-decls
+.endif
#
# The following flag is next up for working on:
# -Wnested-externs
@@ -50,7 +52,9 @@ CWARNFLAGS=-W -Wreturn-type -Wcomment -Wredundant-decls
# When working on removing warnings from code, the `-Werror' flag should be
# of material assistance.
#
+.if !defined(COPTFLAGS)
COPTFLAGS=-O
+.endif
INCLUDES= -I. -I$S -I$S/sys
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
ASFLAGS=
OpenPOWER on IntegriCloud