Date: Thu, 21 Jan 2021 17:47:55 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562226 - head/Mk/Uses Message-ID: <202101211747.10LHltaJ022536@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Thu Jan 21 17:47:55 2021 New Revision: 562226 URL: https://svnweb.freebsd.org/changeset/ports/562226 Log: 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 Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Thu Jan 21 17:31:05 2021 (r562225) +++ head/Mk/Uses/compiler.mk Thu Jan 21 17:47:55 2021 (r562226) @@ -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,100 +186,11 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101211747.10LHltaJ022536>