svn commit: r544791 - head/lang/spidermonkey68
Piotr Kubaj
pkubaj at FreeBSD.org
Thu Aug 13 09:03:53 UTC 2020
Author: pkubaj
Date: Thu Aug 13 09:03:52 2020
New Revision: 544791
URL: https://svnweb.freebsd.org/changeset/ports/544791
Log:
lang/spidermonkey68: fix build on GCC architectures
Use Clang only on clang architectures.
PR: 248635
Approved by: tcberner (maintainer)
Modified:
head/lang/spidermonkey68/Makefile
Modified: head/lang/spidermonkey68/Makefile
==============================================================================
--- head/lang/spidermonkey68/Makefile Thu Aug 13 08:50:10 2020 (r544790)
+++ head/lang/spidermonkey68/Makefile Thu Aug 13 09:03:52 2020 (r544791)
@@ -23,7 +23,7 @@ LIB_DEPENDS= libnspr4.so:devel/nspr \
libffi.so:devel/libffi \
libicudata.so:devel/icu
-USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \
+USES= compiler gmake localbase pathfix pkgconfig \
python:2.7,build tar:xz
USE_LDCONFIG= yes
SP_VER= 68
@@ -52,11 +52,6 @@ CONFIGURE_ENV= HOST_CC=${CC} HOST_CXX=${CXX}
CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
-CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
-CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
-CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
-USES:= ${USES:Ncompiler\:*} # XXX avoid warnings
-
BINARY_ALIAS= python=${PYTHON_CMD}
.include <bsd.port.pre.mk>
@@ -66,9 +61,14 @@ CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
.endif
# Require newer Clang than what's in base system unless user opted out
-. if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+USE_GCC= yes
+.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
+CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
+CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
+CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-. endif
+.endif
post-install:
${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
More information about the svn-ports-head
mailing list