svn commit: r334459 - head/Mk/Uses

[Baptiste Daroussin]

Author: bapt
Date: Wed Nov 20 21:47:29 2013
New Revision: 334459
URL: http://svnweb.freebsd.org/changeset/ports/334459

Log:
  Swap compiler.mk to use gcc 4.7 when requesting a C++11/C11 compiler and clang does not fit or the user explicitly want GCC.

Modified:
  head/Mk/Uses/compiler.mk

Modified: head/Mk/Uses/compiler.mk
==============================================================================
--- head/Mk/Uses/compiler.mk	Wed Nov 20 21:42:20 2013	(r334458)
+++ head/Mk/Uses/compiler.mk	Wed Nov 20 21:47:29 2013	(r334459)
@@ -112,10 +112,10 @@ COMPILER_FEATURES+=	${std}
 
 .if ${_COMPILER_ARGS:Mc++11-lib}
 .if !${COMPILER_FEATURES:Mc++11}
-USE_GCC=	yes
+USE_GCC=	4.7+
 CHOSEN_COMPILER_TYPE=	gcc
 .elif ${COMPILER_TYPE} == clang && ${COMPILER_FEATURES:Mlibstdc++}
-USE_GCC=	yes
+USE_GCC=	4.7+
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
@@ -123,7 +123,7 @@ CHOSEN_COMPILER_TYPE=	gcc
 .if ${_COMPILER_ARGS:Mc++11-lang}
 .if !${COMPILER_FEATURES:Mc++11}
 .if defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc
-USE_GCC=	yes
+USE_GCC=	4.7+
 CHOSEN_COMPILER_TYPE=	gcc
 .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc
 .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33
@@ -149,7 +149,7 @@ LDFLAGS+=	-B${LOCALBASE}/bin
 .if ${_COMPILER_ARGS:Mc11}
 .if !${COMPILER_FEATURES:Mc11}
 .if defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc
-USE_GCC=	yes
+USE_GCC=	4.7+
 CHOSEN_COMPILER_TYPE=	gcc
 .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33