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

Collapse All | Expand All

(-)Mk/Uses/compiler.mk (-2 / +18 lines)
Lines 95-105 Link Here
95
CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}
95
CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}
96
96
97
.if ${_COMPILER_ARGS:Mopenmp}
97
.if ${_COMPILER_ARGS:Mopenmp}
98
.if ${COMPILER_TYPE} == clang
98
.if ${COMPILER_TYPE} == clang && ${ARCH} == amd64
99
USE_GCC=	yes
99
_USES_POST+=	localbase:ldflags
100
BUILD_DEPENDS+=	llvm50>=0:devel/llvm50
101
RUN_DEPENDS+=	llvm50>=0:devel/llvm50
102
CPP=	${LOCALBASE}/bin/clang-cpp50
103
CC=	${LOCALBASE}/bin/clang50
104
CXX=	${LOCALBASE}/bin/clang++50
105
CHOSEN_COMPILER_TYPE=	clang
106
.else
107
USE_GCC=		yes
100
CHOSEN_COMPILER_TYPE=	gcc
108
CHOSEN_COMPILER_TYPE=	gcc
109
.if ${COMPILER_FEATURES:Mlibc++}
110
CXXFLAGS+=	-nostdinc++ -isystem /usr/include/c++/v1
111
LDFLAGS+=	-L${WRKDIR}
112
113
_USES_configure+=	200:gcc-libc++-configure
114
gcc-libc++-configure:
115
	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
101
.endif
116
.endif
102
.endif
117
.endif
118
.endif
103
119
104
.if ${_COMPILER_ARGS:Mnestedfct}
120
.if ${_COMPILER_ARGS:Mnestedfct}
105
.if ${COMPILER_TYPE} == clang
121
.if ${COMPILER_TYPE} == clang
(-)math/openblas/Makefile (+2 lines)
Lines 78-83 Link Here
78
.endif
78
.endif
79
79
80
.if ${PORT_OPTIONS:MOPENMP}
80
.if ${PORT_OPTIONS:MOPENMP}
81
# due to the Fortran dependency, we must require USE_GCC here to avoid mixing different OpenMPs for Fortran and C/C++
82
USE_GCC=	yes
81
USES+=		compiler:openmp
83
USES+=		compiler:openmp
82
BUILDFLAGS_THREAD+=	USE_OPENMP=1
84
BUILDFLAGS_THREAD+=	USE_OPENMP=1
83
.endif
85
.endif

Return to bug 210337