summaryrefslogtreecommitdiff
path: root/Mk/Uses/compiler.mk
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2017-09-12 20:43:58 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2017-09-12 20:43:58 +0000
commit3d86e922851c4eb78329eea4b8c1e2b14e323e5b (patch)
tree3910ec96d9743ab4cd6e828d2d47be7d280af1c3 /Mk/Uses/compiler.mk
parentAdd self to markers. (diff)
Replace USE_GCC=5+ by USE_GCC=yes in the case of USES=compiler:c++14-lang.
When this was added by r392084 on 2015-07-14, the default flavor of GCC was GCC 4.8 and explicitly requesting GCC 5 (or later) was necessary for C++ 14 support. Now that the default version of GCC is GCC 6, after GCC 5 for several months, we can use the preferred notion of USE_GCC=yes instead of specifying a concrete minimum version. Among others this helps with cases where GCC 6 is better adjusted for FreeBSD, notably the well known std::to_string issue (where that is only enabled with GCC 6 or later). PR: 222268 Approved by: portmgr (antoine) MFH: 2017Q3
Notes
Notes: svn path=/head/; revision=449716
Diffstat (limited to 'Mk/Uses/compiler.mk')
-rw-r--r--Mk/Uses/compiler.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index fa7b9b925b1d..b87668b9f3b1 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -144,7 +144,7 @@ CHOSEN_COMPILER_TYPE= gcc
.if ${_COMPILER_ARGS:Mc++14-lang}
.if !${COMPILER_FEATURES:Mc++14}
.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
-USE_GCC= 5+
+USE_GCC= yes
CHOSEN_COMPILER_TYPE= gcc
.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) || ${COMPILER_TYPE} == gcc
.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35