diff options
| author | bapt <bapt@FreeBSD.org> | 2013-11-21 05:47:29 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-11-21 05:47:29 +0800 |
| commit | e6a4bcdb569ed83c4c4d6724b14cf86a3d2f5c42 (patch) | |
| tree | 2c0e38acac1233ebeb561d1f736f5ed32545b0c0 | |
| parent | d9b7913c8e8c2c9b1fb9ea88e3332c9f5de90380 (diff) | |
| download | freebsd-ports-gnome-e6a4bcdb569ed83c4c4d6724b14cf86a3d2f5c42.tar.gz freebsd-ports-gnome-e6a4bcdb569ed83c4c4d6724b14cf86a3d2f5c42.tar.zst freebsd-ports-gnome-e6a4bcdb569ed83c4c4d6724b14cf86a3d2f5c42.zip | |
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.
| -rw-r--r-- | Mk/Uses/compiler.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index b6f7bf633cc7..44ed832ef8ee 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -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 |