Date: Wed, 12 Mar 2014 17:45:49 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347992 - head/Mk/Uses Message-ID: <201403121745.s2CHjnZG019583@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Mar 12 17:45:48 2014 New Revision: 347992 URL: http://svnweb.freebsd.org/changeset/ports/347992 QAT: https://qat.redports.org/buildarchive/r347992/ Log: Now that default gcc is 4.7 switch back to USE_GCC=yes where appropriate Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Wed Mar 12 17:38:28 2014 (r347991) +++ head/Mk/Uses/compiler.mk Wed Mar 12 17:45:48 2014 (r347992) @@ -20,8 +20,8 @@ # # COMPILER_TYPE: can be gcc or clang # ALT_COMPILER_TYPE: can be gcc or clang depending on COMPILER_TYPE, only set if the base system has 2 compilers -# COMPILER_VERSION: first 2 digits of the version: 33 for clang 3.3.*, 46 for gcc 4.6.* -# ALT_COMPILER_VERSION: first 2 digits of the version: 33 for clang 3.3.*, 46 for gcc 4.6.* of the ALT_COMPILER_TYPE +# COMPILER_VERSION: first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.* +# ALT_COMPILER_VERSION: first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.* of the ALT_COMPILER_TYPE # # COMPILER_FEATURES: the list of features supported by the compiler includes the standard C++ library. # CHOSEN_COMPILER_TYPE: can be gcc or clang (type of compiler chosen by the framework) @@ -125,10 +125,10 @@ COMPILER_FEATURES+= ${std} .if ${_COMPILER_ARGS:Mc++11-lib} .if !${COMPILER_FEATURES:Mc++11} -USE_GCC= 4.7+ +USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .elif ${COMPILER_TYPE} == clang && ${COMPILER_FEATURES:Mlibstdc++} -USE_GCC= 4.7+ +USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .endif .endif @@ -136,7 +136,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= 4.7+ +USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33 @@ -188,7 +188,7 @@ LDFLAGS+= -B${LOCALBASE}/bin .if ${_COMPILER_ARGS:Mc11} .if !${COMPILER_FEATURES:Mc11} .if defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc -USE_GCC= 4.7+ +USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc .if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403121745.s2CHjnZG019583>