From 2a07a4c97e7b506d68f021f999654c5c4f972594 Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Tue, 18 Oct 1994 19:45:46 +0000 Subject: [PATCH] Conditionally define CC, CWARNOPTS, etc., so that `makeoptions' in config files actually does something useful. --- sys/conf/Makefile.i386 | 27 ++++++++++++--------------- sys/conf/Makefile.powerpc | 27 ++++++++++++--------------- sys/i386/conf/Makefile.i386 | 27 ++++++++++++--------------- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index d122f4ab740d..215069eefcbf 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.44 1994/10/03 18:51:35 phk Exp $ +# $Id: Makefile.i386,v 1.45 1994/10/03 23:03:38 rgrimes Exp $ # # Makefile for FreeBSD # @@ -20,19 +20,19 @@ # -DTRACE compile in kernel tracing hooks # -DQUOTA compile in file system quotas # -TOUCH= touch -f -c -LD= /usr/bin/ld -CC= cc -CPP= cpp -DBSYM= /usr/sbin/dbsym +TOUCH?= touch -f -c +LD?= /usr/bin/ld +CC?= cc +CPP?= cpp +DBSYM?= /usr/sbin/dbsym .if defined(DEBUG) .if defined(NOSTRIP) -STRIP= echo '(skipping) strip' +STRIP?= echo '(skipping) strip' .else -STRIP= cp $@ $@.sym; strip +STRIP?= cp $@ $@.sym; strip .endif .else -STRIP= strip +STRIP?= strip .endif .if exists(./@/.) @@ -42,9 +42,8 @@ S= ../.. .endif I386= ${S}/i386 -.if !defined(CWARNFLAGS) -CWARNFLAGS=-W -Wreturn-type -Wcomment -Wredundant-decls -.endif +CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls + # # The following flag is next up for working on: # -Wnested-externs @@ -52,9 +51,7 @@ 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 +COPTFLAGS?=-O INCLUDES= -I. -I$S -I$S/sys COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ASFLAGS= diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index d122f4ab740d..215069eefcbf 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.44 1994/10/03 18:51:35 phk Exp $ +# $Id: Makefile.i386,v 1.45 1994/10/03 23:03:38 rgrimes Exp $ # # Makefile for FreeBSD # @@ -20,19 +20,19 @@ # -DTRACE compile in kernel tracing hooks # -DQUOTA compile in file system quotas # -TOUCH= touch -f -c -LD= /usr/bin/ld -CC= cc -CPP= cpp -DBSYM= /usr/sbin/dbsym +TOUCH?= touch -f -c +LD?= /usr/bin/ld +CC?= cc +CPP?= cpp +DBSYM?= /usr/sbin/dbsym .if defined(DEBUG) .if defined(NOSTRIP) -STRIP= echo '(skipping) strip' +STRIP?= echo '(skipping) strip' .else -STRIP= cp $@ $@.sym; strip +STRIP?= cp $@ $@.sym; strip .endif .else -STRIP= strip +STRIP?= strip .endif .if exists(./@/.) @@ -42,9 +42,8 @@ S= ../.. .endif I386= ${S}/i386 -.if !defined(CWARNFLAGS) -CWARNFLAGS=-W -Wreturn-type -Wcomment -Wredundant-decls -.endif +CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls + # # The following flag is next up for working on: # -Wnested-externs @@ -52,9 +51,7 @@ 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 +COPTFLAGS?=-O INCLUDES= -I. -I$S -I$S/sys COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ASFLAGS= diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index d122f4ab740d..215069eefcbf 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.44 1994/10/03 18:51:35 phk Exp $ +# $Id: Makefile.i386,v 1.45 1994/10/03 23:03:38 rgrimes Exp $ # # Makefile for FreeBSD # @@ -20,19 +20,19 @@ # -DTRACE compile in kernel tracing hooks # -DQUOTA compile in file system quotas # -TOUCH= touch -f -c -LD= /usr/bin/ld -CC= cc -CPP= cpp -DBSYM= /usr/sbin/dbsym +TOUCH?= touch -f -c +LD?= /usr/bin/ld +CC?= cc +CPP?= cpp +DBSYM?= /usr/sbin/dbsym .if defined(DEBUG) .if defined(NOSTRIP) -STRIP= echo '(skipping) strip' +STRIP?= echo '(skipping) strip' .else -STRIP= cp $@ $@.sym; strip +STRIP?= cp $@ $@.sym; strip .endif .else -STRIP= strip +STRIP?= strip .endif .if exists(./@/.) @@ -42,9 +42,8 @@ S= ../.. .endif I386= ${S}/i386 -.if !defined(CWARNFLAGS) -CWARNFLAGS=-W -Wreturn-type -Wcomment -Wredundant-decls -.endif +CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls + # # The following flag is next up for working on: # -Wnested-externs @@ -52,9 +51,7 @@ 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 +COPTFLAGS?=-O INCLUDES= -I. -I$S -I$S/sys COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ASFLAGS=