diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2021-01-21 17:47:55 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2021-01-21 17:47:55 +0000 |
| commit | 6d6094534beff98974e1a481069deb04d78713f1 (patch) | |
| tree | 21e989b21c05e9aa701b2220e4ce3c23b44d5b17 /Mk/Uses/compiler.mk | |
| parent | sysutils/dmidecode: expand platform support (diff) | |
compiler.mk: Update clang dependency to v10; clean up duplication
PR: 252627
Approved by: brooks, portmgr (swills)
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D28120
Notes
Notes:
svn path=/head/; revision=562226
Diffstat (limited to 'Mk/Uses/compiler.mk')
| -rw-r--r-- | Mk/Uses/compiler.mk | 104 |
1 files changed, 9 insertions, 95 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index fc1dbe8cfddf..cfbc35da3282 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -171,8 +171,11 @@ CHOSEN_COMPILER_TYPE= gcc .endif .endif -.if ${_COMPILER_ARGS:Mc++17-lang} -.if !${COMPILER_FEATURES:Mc++17} +.if (${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \ +(${_COMPILER_ARGS:Mc++14-lang} && !${COMPILER_FEATURES:Mc++14}) || \ +(${_COMPILER_ARGS:Mc++11-lang} && !${COMPILER_FEATURES:Mc++11}) || \ +(${_COMPILER_ARGS:Mc++0x} && !${COMPILER_FEATURES:Mc++0x}) || \ +(${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11}) .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc @@ -183,103 +186,14 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang10:devel/llvm10 +CPP= ${LOCALBASE}/bin/clang-cpp10 +CC= ${LOCALBASE}/bin/clang10 +CXX= ${LOCALBASE}/bin/clang++10 CHOSEN_COMPILER_TYPE= clang .endif .endif .endif -.endif - -.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= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -CHOSEN_COMPILER_TYPE= clang -.endif -.endif -.endif -.endif - -.if ${_COMPILER_ARGS:Mc++11-lang} -.if !${COMPILER_FEATURES:Mc++11} -.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -CHOSEN_COMPILER_TYPE= clang -.endif -.endif -.endif -.endif - -.if ${_COMPILER_ARGS:Mc++0x} -.if !${COMPILER_FEATURES:Mc++0x} -.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -.endif -.endif -.endif -.endif - -.if ${_COMPILER_ARGS:Mc11} -.if !${COMPILER_FEATURES:Mc11} -.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -.endif -.endif -.endif -.endif .if ${_COMPILER_ARGS:Mgcc-c++11-lib} USE_GCC= yes |