diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 836f23a62c14..00146a138fbd 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -25,17 +25,9 @@ CFLAGS+=	-std=iso9899:1999
 CFLAGS+=	-std=${CSTD}
 .endif # CSTD
 
-.if ${COMPILER_FEATURES:Mc++11}
-CXXSTD?=	c++11
-.elif ${COMPILER_TYPE} == "gcc"
-# Prior versions of g++ support C++98 with GNU extensions by default.
-CXXSTD?=	gnu++98
-.else
-# Assume that the compiler supports at least C++98.
-CXXSTD?=	c++98
-.endif
+.if !empty(CXXSTD)
 CXXFLAGS+=	-std=${CXXSTD}
-# CXXSTD
+.endif
 
 # -pedantic is problematic because it also imposes namespace restrictions
 #CFLAGS+=	-pedantic
diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk
index 98f0e6a6fbe3..ee08a9a70dcc 100644
--- a/share/mk/googletest.test.inc.mk
+++ b/share/mk/googletest.test.inc.mk
@@ -9,4 +9,6 @@ GTESTS_CXXFLAGS+= -frtti
 # libgmock's, etc, headers.
 CXXFLAGS+=	-I${DESTDIR}${INCLUDEDIR}/private
 
+CXXSTD?=	c++11
+
 NO_WTHREAD_SAFETY=