diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-03-12 17:45:48 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-03-12 17:45:48 +0000 |
| commit | 9e94573f8f93a63b381c4170c33ecc7d7ea11d08 (patch) | |
| tree | bb32fcb104d5a1eda867d35600e231a4e497efe4 /Mk/Uses/compiler.mk | |
| parent | - Update to 2.28 (diff) | |
Now that default gcc is 4.7 switch back to USE_GCC=yes where appropriate
Notes
Notes:
svn path=/head/; revision=347992
Diffstat (limited to 'Mk/Uses/compiler.mk')
| -rw-r--r-- | Mk/Uses/compiler.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 0d9b16643632..4a2bbc4b1c1e 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -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 |