Attachment #190857 for bug #210337




.elif ${compiler_ARGS} == env
_COMPILER_ARGS+=	env
.elif ${compiler_ARGS} == openmp
_COMPILER_ARGS+=	features openmp
.elif ${compiler_ARGS} == nestedfct
_COMPILER_ARGS+=	env nestedfct
.else


CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}

.if ${_COMPILER_ARGS:Mopenmp}
.if ${COMPILER_TYPE} == clang
USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
.endif
.endif

.if ${_COMPILER_ARGS:Mnestedfct}
.if ${COMPILER_TYPE} == clang
USE_GCC=	any

.endfor
.endif

.if ${_COMPILER_ARGS:Mopenmp}
.if ${COMPILER_TYPE} == clang && ${ARCH} == amd64
BUILD_DEPENDS+=	llvm50>=0:devel/llvm50
RUN_DEPENDS+=	llvm50>=0:devel/llvm50
CPP=	${LOCALBASE}/bin/clang-cpp50
CC=	${LOCALBASE}/bin/clang50
CXX=	${LOCALBASE}/bin/clang++50
CHOSEN_COMPILER_TYPE=	clang
.else
USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
.if ${COMPILER_FEATURES:Mlibc++}
CXXFLAGS+=	-nostdinc++ -isystem /usr/include/c++/v1
LDFLAGS+=	-L${WRKDIR}

_USES_configure+=	200:gcc-libc++-configure
gcc-libc++-configure:
	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
.endif
.endif
.endif

.if ${_COMPILER_ARGS:Mc++11-lib}
.if !${COMPILER_FEATURES:Mc++11}
USE_GCC=	yes

Return to bug 210337

Lines 54-60 Link Here

(-)Mk/Uses/compiler.mk (-8 / +23 lines)
54	.elif ${compiler_ARGS} == env	54	.elif ${compiler_ARGS} == env
55	_COMPILER_ARGS+= env	55	_COMPILER_ARGS+= env
56	.elif ${compiler_ARGS} == openmp	56	.elif ${compiler_ARGS} == openmp
57	_COMPILER_ARGS+= env openmp	57	_COMPILER_ARGS+= features openmp
58	.elif ${compiler_ARGS} == nestedfct	58	.elif ${compiler_ARGS} == nestedfct
59	_COMPILER_ARGS+= env nestedfct	59	_COMPILER_ARGS+= env nestedfct
60	.else	60	.else
Lines 94-106 Link Here
94		94
95	CHOSEN_COMPILER_TYPE= ${COMPILER_TYPE}	95	CHOSEN_COMPILER_TYPE= ${COMPILER_TYPE}
96		96
97	.if ${_COMPILER_ARGS:Mopenmp}
98	.if ${COMPILER_TYPE} == clang
99	USE_GCC= yes
100	CHOSEN_COMPILER_TYPE= gcc
101	.endif
102	.endif
103
104	.if ${_COMPILER_ARGS:Mnestedfct}	97	.if ${_COMPILER_ARGS:Mnestedfct}
105	.if ${COMPILER_TYPE} == clang	98	.if ${COMPILER_TYPE} == clang
106	USE_GCC= any	99	USE_GCC= any
Lines 131-136 Link Here
131	.endfor	124	.endfor
132	.endif	125	.endif
133		126
		127	.if ${_COMPILER_ARGS:Mopenmp}
		128	.if ${COMPILER_TYPE} == clang && ${ARCH} == amd64
		129	BUILD_DEPENDS+= llvm50>=0:devel/llvm50
		130	RUN_DEPENDS+= llvm50>=0:devel/llvm50
		131	CPP= ${LOCALBASE}/bin/clang-cpp50
		132	CC= ${LOCALBASE}/bin/clang50
		133	CXX= ${LOCALBASE}/bin/clang++50
		134	CHOSEN_COMPILER_TYPE= clang
		135	.else
		136	USE_GCC= yes
		137	CHOSEN_COMPILER_TYPE= gcc
		138	.if ${COMPILER_FEATURES:Mlibc++}
		139	CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1
		140	LDFLAGS+= -L${WRKDIR}
		141
		142	_USES_configure+= 200:gcc-libc++-configure
		143	gcc-libc++-configure:
		144	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
		145	.endif
		146	.endif
		147	.endif
		148
134	.if ${_COMPILER_ARGS:Mc++11-lib}	149	.if ${_COMPILER_ARGS:Mc++11-lib}
135	.if !${COMPILER_FEATURES:Mc++11}	150	.if !${COMPILER_FEATURES:Mc++11}
136	USE_GCC= yes	151	USE_GCC= yes