Attachment 190857 Details for Bug 210337 – openmp.diff

[patch] openmp.diff

openmp.diff (text/plain), 1.37 KB, created by Antoine Brodin on 2018-02-21 14:20:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2018-02-21 14:20:14 UTC

Size: 1.37 KB

patch

obsolete

>Index: Mk/Uses/compiler.mk
>===================================================================
>--- Mk/Uses/compiler.mk	(revision 462342)
>+++ Mk/Uses/compiler.mk	(working copy)
>@@ -54,7 +54,7 @@
> .elif ${compiler_ARGS} == env
> _COMPILER_ARGS+=	env
> .elif ${compiler_ARGS} == openmp
>-_COMPILER_ARGS+=	env openmp
>+_COMPILER_ARGS+=	features openmp
> .elif ${compiler_ARGS} == nestedfct
> _COMPILER_ARGS+=	env nestedfct
> .else
>@@ -94,13 +94,6 @@
> 
> 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
>@@ -131,6 +124,28 @@
> .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

Actions: View | Diff

Attachments on bug 210337: 182261 | 182547 | 186836 | 190744 | 190857 | 194147