View | Details | Raw Unified | Return to bug 248635
Collapse All | Expand All

(-)Makefile (-8 / +8 lines)
Lines 23-29 Link Here
23
		libffi.so:devel/libffi \
23
		libffi.so:devel/libffi \
24
		libicudata.so:devel/icu
24
		libicudata.so:devel/icu
25
25
26
USES=		compiler:c++14-lang gmake localbase pathfix pkgconfig \
26
USES=		compiler gmake localbase pathfix pkgconfig \
27
		python:2.7,build tar:xz
27
		python:2.7,build tar:xz
28
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
29
SP_VER=		68
29
SP_VER=		68
Lines 52-62 Link Here
52
52
53
CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
53
CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
54
54
55
CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
56
CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
57
CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
58
USES:=		${USES:Ncompiler\:*} # XXX avoid warnings
59
60
BINARY_ALIAS=	python=${PYTHON_CMD}
55
BINARY_ALIAS=	python=${PYTHON_CMD}
61
56
62
.include <bsd.port.pre.mk>
57
.include <bsd.port.pre.mk>
Lines 66-74 Link Here
66
.endif
61
.endif
67
62
68
# Require newer Clang than what's in base system unless user opted out
63
# Require newer Clang than what's in base system unless user opted out
69
. if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
64
.if ${CHOSEN_COMPILER_TYPE} == gcc
65
USE_GCC=	yes
66
.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
67
CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
68
CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
69
CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
70
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
70
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
71
. endif
71
.endif
72
72
73
post-install:
73
post-install:
74
	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
74
	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs

Return to bug 248635