View | Details | Raw Unified | Return to bug 222415 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/compiler.mk (-3 / +27 lines)
Lines 9-14 Link Here
9
# c++0x:	The port needs a compiler understanding C++0X
9
# c++0x:	The port needs a compiler understanding C++0X
10
# c++11-lang:	The port needs a compiler understanding C++11
10
# c++11-lang:	The port needs a compiler understanding C++11
11
# c++14-lang:	The port needs a compiler understanding C++14
11
# c++14-lang:	The port needs a compiler understanding C++14
12
# c++17-lang:	The port needs a compiler understanding C++17
12
# gcc-c++11-lib:The port needs g++ compiler with a C++11 library
13
# gcc-c++11-lib:The port needs g++ compiler with a C++11 library
13
# c++11-lib:	The port needs a compiler understanding C++11 and with a C++11 ready standard library
14
# c++11-lib:	The port needs a compiler understanding C++11 and with a C++11 ready standard library
14
# c11:		The port needs a compiler understanding C11
15
# c11:		The port needs a compiler understanding C11
Lines 35-41 _INCLUDE_USES_COMPILER_MK= yes Link Here
35
compiler_ARGS=	env
36
compiler_ARGS=	env
36
.endif
37
.endif
37
38
38
VALID_ARGS=	c++11-lib c++11-lang c++14-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
39
VALID_ARGS=	c++11-lib c++11-lang c++14-lang c++17-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
39
40
40
.if ${compiler_ARGS} == gcc-c++11-lib
41
.if ${compiler_ARGS} == gcc-c++11-lib
41
_COMPILER_ARGS+=	features gcc-c++11-lib
42
_COMPILER_ARGS+=	features gcc-c++11-lib
Lines 47-52 _COMPILER_ARGS+= features c++0x Link Here
47
_COMPILER_ARGS+=	features c++11-lang
48
_COMPILER_ARGS+=	features c++11-lang
48
.elif ${compiler_ARGS} == c++14-lang
49
.elif ${compiler_ARGS} == c++14-lang
49
_COMPILER_ARGS+=	features c++14-lang
50
_COMPILER_ARGS+=	features c++14-lang
51
.elif ${compiler_ARGS} == c++17-lang
52
_COMPILER_ARGS+=	features c++17-lang
50
.elif ${compiler_ARGS} == c11
53
.elif ${compiler_ARGS} == c11
51
_COMPILER_ARGS+=	features c11
54
_COMPILER_ARGS+=	features c11
52
.elif ${compiler_ARGS} == features
55
.elif ${compiler_ARGS} == features
Lines 117-123 COMPILER_FEATURES= libstdc++ Link Here
117
.endif
120
.endif
118
121
119
CSTD=	c89 c99 c11 gnu89 gnu99 gnu11
122
CSTD=	c89 c99 c11 gnu89 gnu99 gnu11
120
CXXSTD=	c++98 c++0x c++11 c++14 gnu++98 gnu++11
123
CXXSTD=	c++98 c++0x c++11 c++14 c++17 gnu++98 gnu++11
121
124
122
.for std in ${CSTD} ${CXXSTD}
125
.for std in ${CSTD} ${CXXSTD}
123
_LANG=c
126
_LANG=c
Lines 141-146 CHOSEN_COMPILER_TYPE= gcc Link Here
141
.endif
144
.endif
142
.endif
145
.endif
143
146
147
.if ${_COMPILER_ARGS:Mc++17-lang}
148
.if !${COMPILER_FEATURES:Mc++17}
149
.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
150
USE_GCC=	yes
151
CHOSEN_COMPILER_TYPE=	gcc
152
.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 50) || ${COMPILER_TYPE} == gcc
153
.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 50
154
CPP=	clang-cpp
155
CC=	clang
156
CXX=	clang++
157
CHOSEN_COMPILER_TYPE=	clang
158
.else
159
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang50:devel/llvm50
160
CPP=	${LOCALBASE}/bin/clang-cpp50
161
CC=	${LOCALBASE}/bin/clang50
162
CXX=	${LOCALBASE}/bin/clang++50
163
CHOSEN_COMPILER_TYPE=	clang
164
.endif
165
.endif
166
.endif
167
.endif
168
144
.if ${_COMPILER_ARGS:Mc++14-lang}
169
.if ${_COMPILER_ARGS:Mc++14-lang}
145
.if !${COMPILER_FEATURES:Mc++14}
170
.if !${COMPILER_FEATURES:Mc++14}
146
.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
171
.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
147
- 

Return to bug 222415