From 45f07c735955838c92492606d877644f4d7577cf Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 1 Jun 2003 22:13:45 +0000
Subject: Use a bigger hammer -- keep all -std= out of CXXFLAGS. Also allow for
 "CSTD=" in a Makefile.

---
 share/mk/bsd.sys.mk | 2 +-
 share/mk/sys.mk     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'share')

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index be5b9bf..25c7056 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -8,8 +8,8 @@
 
 # for GCC:  http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
 
-.if !defined(PROG_CXX)
 CSTD		?=	c99
+.if ${CSTD} != ""
 . if ${CSTD} == "k&r"
 CFLAGS		+=	-traditional
 . elif ${CSTD} == "c89" || ${CSTD} == "c90"
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index edf461e..219ab7a 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -42,7 +42,7 @@ CC		?=	cc
 CFLAGS		?=	-O -pipe
 
 CXX		?=	c++
-CXXFLAGS	?=	${CFLAGS}
+CXXFLAGS	?=	${CFLAGS:C/-std=[a-z:0-9]+//}
 
 CPP		?=	cpp
 
-- 
cgit v1.1