Attachment #194992 for bug #229626




USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 50) || ${COMPILER_TYPE} == gcc
CHOSEN_COMPILER_TYPE=	clang
.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 50
REALLY_REALLY_WANT_CLANG=	base
CC=	clang
CXX=	clang++
CHOSEN_COMPILER_TYPE=	clang
.else
REALLY_REALLY_WANT_CLANG=	60
CPP=	${LOCALBASE}/bin/clang-cpp60
CC=	${LOCALBASE}/bin/clang60
CXX=	${LOCALBASE}/bin/clang++60
CHOSEN_COMPILER_TYPE=	clang
.endif
.endif
.endif

USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) || ${COMPILER_TYPE} == gcc
CHOSEN_COMPILER_TYPE=	clang
.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35
REALLY_REALLY_WANT_CLANG=	base
CC=	clang
CXX=	clang++
CHOSEN_COMPILER_TYPE=	clang
.else
REALLY_REALLY_WANT_CLANG=	60
CPP=	${LOCALBASE}/bin/clang-cpp60
CC=	${LOCALBASE}/bin/clang60
CXX=	${LOCALBASE}/bin/clang++60
CHOSEN_COMPILER_TYPE=	clang
.endif
.endif
.endif

USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
.elif ${COMPILER_TYPE} == gcc
CHOSEN_COMPILER_TYPE=	clang
.if ${ALT_COMPILER_TYPE} == clang
REALLY_REALLY_WANT_CLANG=	base
CC=	clang
CXX=	clang++
CHOSEN_COMPILER_TYPE=	clang
.else
REALLY_REALLY_WANT_CLANG=	60
CPP=	${LOCALBASE}/bin/clang-cpp60
CC=	${LOCALBASE}/bin/clang60
CXX=	${LOCALBASE}/bin/clang++60
CHOSEN_COMPILER_TYPE=	clang
.endif
.endif
.endif

USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
.elif ${COMPILER_TYPE} == gcc
CHOSEN_COMPILER_TYPE=	clang
.if ${ALT_COMPILER_TYPE} == clang
REALLY_REALLY_WANT_CLANG=	base
CC=	clang
CXX=	clang++
CHOSEN_COMPILER_TYPE=	clang
.else
REALLY_REALLY_WANT_CLANG=	60
CHOSEN_COMPILER_TYPE=	clang
CPP=	${LOCALBASE}/bin/clang-cpp60
CC=	${LOCALBASE}/bin/clang60
CXX=	${LOCALBASE}/bin/clang++60
.endif
.endif
.endif

USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
.elif ${COMPILER_TYPE} == gcc
CHOSEN_COMPILER_TYPE=	clang
.if ${ALT_COMPILER_TYPE} == clang
REALLY_REALLY_WANT_CLANG=	base
CC=	clang
CXX=	clang++
CHOSEN_COMPILER_TYPE=	clang
.else
REALLY_REALLY_WANT_CLANG=	60
CHOSEN_COMPILER_TYPE=	clang
CPP=	${LOCALBASE}/bin/clang-cpp60
CC=	${LOCALBASE}/bin/clang60
CXX=	${LOCALBASE}/bin/clang++60
.endif
.endif
.endif

.endif
.endif

.if defined(REALLY_REALLY_WANT_CLANG)
.if ${ALT_COMPILER_TYPE} == clang || $(REALLY_REALLY_WANT_CLANG) == base
CPP=	clang-cpp
CC=	clang
CXX=	clang++
CHOSEN_COMPILER_TYPE=	clang
.elif $(REALLY_REALLY_WANT_CLANG) == 60
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
.elif $(REALLY_REALLY_WANT_CLANG) == 50
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang50:devel/llvm50
CHOSEN_COMPILER_TYPE=	clang
CPP=	${LOCALBASE}/bin/clang-cpp50
CC=	${LOCALBASE}/bin/clang50
CXX=	${LOCALBASE}/bin/clang++50
.elif $(REALLY_REALLY_WANT_CLANG) == 40
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang40:devel/llvm40
CHOSEN_COMPILER_TYPE=	clang
CPP=	${LOCALBASE}/bin/clang-cpp40
CC=	${LOCALBASE}/bin/clang40
CXX=	${LOCALBASE}/bin/clang++40
.else
.warning "REALLY_REALLY_WANT_CLANG defined to something other than 40,50, 60: ${REALLY_REALLY_WANT_CLANG}"
.endif
.endif

.endif

Lines 66-74 Link Here

(-)sysutils/osquery/Makefile (-3 / +4 lines)
66	.include <bsd.port.pre.mk>	66	.include <bsd.port.pre.mk>
67		67
68	.if ${OSVERSION} < 1100000	68	.if ${OSVERSION} < 1100000
69	BUILD_DEPENDS+= clang40:devel/llvm40	69	REALLY_REALLY_WANT_CLANG= 40
70	CC= clang40	70	#BUILD_DEPENDS+= clang40:devel/llvm40
71	CXX= clang++40	71	#CC= clang40
		72	#CXX= clang++40
72	.endif	73	.endif
73		74
74	post-patch:	75	post-patch:

Return to bug 229626

Lines 177-193 Link Here

(-)Mk/Uses/compiler.mk (-45 / +44 lines)
177	USE_GCC= yes	177	USE_GCC= yes
178	CHOSEN_COMPILER_TYPE= gcc	178	CHOSEN_COMPILER_TYPE= gcc
179	.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 50) \|\| ${COMPILER_TYPE} == gcc	179	.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 50) \|\| ${COMPILER_TYPE} == gcc
		180	CHOSEN_COMPILER_TYPE= clang
180	.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 50	181	.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 50
181	CPP= clang-cpp	182	REALLY_REALLY_WANT_CLANG= base
182	CC= clang
183	CXX= clang++
184	CHOSEN_COMPILER_TYPE= clang
185	.else	183	.else
186	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60	184	REALLY_REALLY_WANT_CLANG= 60
187	CPP= ${LOCALBASE}/bin/clang-cpp60
188	CC= ${LOCALBASE}/bin/clang60
189	CXX= ${LOCALBASE}/bin/clang++60
190	CHOSEN_COMPILER_TYPE= clang
191	.endif	185	.endif
192	.endif	186	.endif
193	.endif	187	.endif
Lines 199-215 Link Here
199	USE_GCC= yes	193	USE_GCC= yes
200	CHOSEN_COMPILER_TYPE= gcc	194	CHOSEN_COMPILER_TYPE= gcc
201	.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) \|\| ${COMPILER_TYPE} == gcc	195	.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) \|\| ${COMPILER_TYPE} == gcc
		196	CHOSEN_COMPILER_TYPE= clang
202	.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35	197	.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35
203	CPP= clang-cpp	198	REALLY_REALLY_WANT_CLANG= base
204	CC= clang
205	CXX= clang++
206	CHOSEN_COMPILER_TYPE= clang
207	.else	199	.else
208	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60	200	REALLY_REALLY_WANT_CLANG= 60
209	CPP= ${LOCALBASE}/bin/clang-cpp60
210	CC= ${LOCALBASE}/bin/clang60
211	CXX= ${LOCALBASE}/bin/clang++60
212	CHOSEN_COMPILER_TYPE= clang
213	.endif	201	.endif
214	.endif	202	.endif
215	.endif	203	.endif
Lines 221-237 Link Here
221	USE_GCC= yes	209	USE_GCC= yes
222	CHOSEN_COMPILER_TYPE= gcc	210	CHOSEN_COMPILER_TYPE= gcc
223	.elif ${COMPILER_TYPE} == gcc	211	.elif ${COMPILER_TYPE} == gcc
		212	CHOSEN_COMPILER_TYPE= clang
224	.if ${ALT_COMPILER_TYPE} == clang	213	.if ${ALT_COMPILER_TYPE} == clang
225	CPP= clang-cpp	214	REALLY_REALLY_WANT_CLANG= base
226	CC= clang
227	CXX= clang++
228	CHOSEN_COMPILER_TYPE= clang
229	.else	215	.else
230	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60	216	REALLY_REALLY_WANT_CLANG= 60
231	CPP= ${LOCALBASE}/bin/clang-cpp60
232	CC= ${LOCALBASE}/bin/clang60
233	CXX= ${LOCALBASE}/bin/clang++60
234	CHOSEN_COMPILER_TYPE= clang
235	.endif	217	.endif
236	.endif	218	.endif
237	.endif	219	.endif
Lines 243-259 Link Here
243	USE_GCC= yes	225	USE_GCC= yes
244	CHOSEN_COMPILER_TYPE= gcc	226	CHOSEN_COMPILER_TYPE= gcc
245	.elif ${COMPILER_TYPE} == gcc	227	.elif ${COMPILER_TYPE} == gcc
		228	CHOSEN_COMPILER_TYPE= clang
246	.if ${ALT_COMPILER_TYPE} == clang	229	.if ${ALT_COMPILER_TYPE} == clang
247	CPP= clang-cpp	230	REALLY_REALLY_WANT_CLANG= base
248	CC= clang
249	CXX= clang++
250	CHOSEN_COMPILER_TYPE= clang
251	.else	231	.else
252	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60	232	REALLY_REALLY_WANT_CLANG= 60
253	CHOSEN_COMPILER_TYPE= clang
254	CPP= ${LOCALBASE}/bin/clang-cpp60
255	CC= ${LOCALBASE}/bin/clang60
256	CXX= ${LOCALBASE}/bin/clang++60
257	.endif	233	.endif
258	.endif	234	.endif
259	.endif	235	.endif
Lines 265-281 Link Here
265	USE_GCC= yes	241	USE_GCC= yes
266	CHOSEN_COMPILER_TYPE= gcc	242	CHOSEN_COMPILER_TYPE= gcc
267	.elif ${COMPILER_TYPE} == gcc	243	.elif ${COMPILER_TYPE} == gcc
		244	CHOSEN_COMPILER_TYPE= clang
268	.if ${ALT_COMPILER_TYPE} == clang	245	.if ${ALT_COMPILER_TYPE} == clang
269	CPP= clang-cpp	246	REALLY_REALLY_WANT_CLANG= base
270	CC= clang
271	CXX= clang++
272	CHOSEN_COMPILER_TYPE= clang
273	.else	247	.else
274	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60	248	REALLY_REALLY_WANT_CLANG= 60
275	CHOSEN_COMPILER_TYPE= clang
276	CPP= ${LOCALBASE}/bin/clang-cpp60
277	CC= ${LOCALBASE}/bin/clang60
278	CXX= ${LOCALBASE}/bin/clang++60
279	.endif	249	.endif
280	.endif	250	.endif
281	.endif	251	.endif
Lines 294-297 Link Here
294	.endif	264	.endif
295	.endif	265	.endif
296		266
		267	.if defined(REALLY_REALLY_WANT_CLANG)
		268	.if ${ALT_COMPILER_TYPE} == clang \|\| $(REALLY_REALLY_WANT_CLANG) == base
		269	CPP= clang-cpp
		270	CC= clang
		271	CXX= clang++
		272	CHOSEN_COMPILER_TYPE= clang
		273	.elif $(REALLY_REALLY_WANT_CLANG) == 60
		274	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60
		275	CHOSEN_COMPILER_TYPE= clang
		276	CPP= ${LOCALBASE}/bin/clang-cpp60
		277	CC= ${LOCALBASE}/bin/clang60
		278	CXX= ${LOCALBASE}/bin/clang++60
		279	.elif $(REALLY_REALLY_WANT_CLANG) == 50
		280	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang50:devel/llvm50
		281	CHOSEN_COMPILER_TYPE= clang
		282	CPP= ${LOCALBASE}/bin/clang-cpp50
		283	CC= ${LOCALBASE}/bin/clang50
		284	CXX= ${LOCALBASE}/bin/clang++50
		285	.elif $(REALLY_REALLY_WANT_CLANG) == 40
		286	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang40:devel/llvm40
		287	CHOSEN_COMPILER_TYPE= clang
		288	CPP= ${LOCALBASE}/bin/clang-cpp40
		289	CC= ${LOCALBASE}/bin/clang40
		290	CXX= ${LOCALBASE}/bin/clang++40
		291	.else
		292	.warning "REALLY_REALLY_WANT_CLANG defined to something other than 40,50, 60: ${REALLY_REALLY_WANT_CLANG}"
297	.endif	293	.endif
		294	.endif
		295
		296	.endif