CXXSTD is the C++ analogue to CSTD.

CXXSTD defaults to `-std=c++11` with supporting compilers; `-std=gnu++98`,
otherwise for older versions of g++.

This change standardizes the CXXSTD variable, originally added to
googletest.test.inc.mk as part of r345203.

As part of this effort, convert all `CXXFLAGS+= -std=*` calls to use `CXXSTD`.

Notes:

This value is not sanity checked in bsd.sys.mk, however, given the two
most used C++ compilers on FreeBSD (clang++ and g++) support both modes, it is
likely to work with both toolchains. This method will be refined in the future
to support more variants of C++, as not all versions of clang++ and g++ (for
instance) support C++14, C++17, etc.

Any manual appending of `-std=*` to `CXXFLAGS` should be replaced with CXXSTD.
Example:

Before this commit:
```
CXXFLAGS+=	-std=c++14
```

After this commit:
```
CXXSTD=	c++14
```

Reviewed by:	asomers
Approved by:	emaste (mentor)
MFC after:	1 month
Relnotes:	yes
Differential Revision:	https://reviews.freebsd.org/D19732

This commit is contained in:

Enji Cooper

2019-03-29 18:13:44 +00:00

parent 5d00c5a657

commit 9a41926bfb

15 changed files with 28 additions and 31 deletions

									
										share/mk/googletest.test.inc.mk
									
		-4
	
												View File
												
				@@ -1,13 +1,9 @@

				# $FreeBSD$

				# XXX: this should be defined in bsd.sys.mk

				CXXSTD?=	c++11

				GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1

				GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1

				GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1

				GTESTS_CXXFLAGS+= -frtti

				GTESTS_CXXFLAGS+= -std=${CXXSTD}

				# XXX: src.libnames.mk should handle adding this directory for libgtest's,

				# libgmock's, etc, headers.