Attachment 158016 Details for Bug 201076 – patch

[patch] patch

compiler.diff (text/plain), 2.21 KB, created by Brad Davis on 2015-06-23 14:58:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2015-06-23 14:58:46 UTC

Size: 2.21 KB

patch

obsolete

>Index: Mk/Uses/compiler.mk
>===================================================================
>--- Mk/Uses/compiler.mk	(revision 390417)
>+++ Mk/Uses/compiler.mk	(working copy)
>@@ -8,6 +8,7 @@
> #
> # c++0x:	The port needs a compiler understanding C++0X
> # c++11-lang:	The port needs a compiler understanding C++11
>+# c++14-lang:	The port needs a compiler understanding C++14
> # gcc-c++11-lib:The port needs g++ compiler with a C++11 library
> # c++11-lib:	The port needs a compiler understanding C++11 and with a C++11 ready standard library
> # c11:		The port needs a compiler understanding C11
>@@ -34,7 +35,7 @@
> compiler_ARGS=	env
> .endif
> 
>-VALID_ARGS=	c++11-lib c++11-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
>+VALID_ARGS=	c++11-lib c++11-lang c++14-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
> 
> .if ${compiler_ARGS} == gcc-c++11-lib
> _COMPILER_ARGS+=	features gcc-c++11-lib
>@@ -44,6 +45,8 @@
> _COMPILER_ARGS+=	features c++0x
> .elif ${compiler_ARGS} == c++11-lang
> _COMPILER_ARGS+=	features c++11-lang
>+.elif ${compiler_ARGS} == c++14-lang
>+_COMPILER_ARGS+=	features c++14-lang
> .elif ${compiler_ARGS} == c11
> _COMPILER_ARGS+=	features c11
> .elif ${compiler_ARGS} == features
>@@ -138,6 +141,32 @@
> .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=	5+
>+CHOSEN_COMPILER_TYPE=	gcc
>+.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) || ${COMPILER_TYPE} == gcc
>+.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35
>+CPP=	clang-cpp
>+CC=	clang
>+CXX=	clang++
>+CHOSEN_COMPILER_TYPE=	clang
>+.else
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang35:${PORTSDIR}/lang/clang35
>+CPP=	${LOCALBASE}/bin/clang-cpp35
>+CC=	${LOCALBASE}/bin/clang35
>+CXX=	${LOCALBASE}/bin/clang++35
>+CHOSEN_COMPILER_TYPE=	clang
>+.if ${OSVERSION} < 900033
>+USE_BINUTILS=	yes
>+LDFLAGS+=	-B${LOCALBASE}/bin
>+.endif
>+.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

Actions: View | Diff

Attachments on bug 201076: 158016