Attachment 221516 Details for Bug 252627 – compiler.mk: Update clang/llvm dependency from v6 to v10, clean up duplication

[patch] compiler.mk: Update clang/llvm dependency from v6 to v10, clean up duplication

compiler.mk.diff (text/plain), 3.61 KB, created by Joseph Mingrone on 2021-01-13 00:39:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2021-01-13 00:39:47 UTC

Size: 3.61 KB

patch

obsolete

>Index: Mk/Uses/compiler.mk
>===================================================================
>--- Mk/Uses/compiler.mk
>+++ Mk/Uses/compiler.mk
>@@ -171,8 +171,11 @@
> .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 @@
> 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

Flags:

jrm: maintainer-approval? (portmgr)

Actions: View | Diff

Attachments on bug 252627: 221516