diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-13 09:03:52 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-13 09:03:52 +0000 |
| commit | c47d80d2e73b9ab2eaa33618a8276effcab6b6ab (patch) | |
| tree | 816481a59652cbc58f19ab72d58d89bc060831d4 /lang | |
| parent | 679f4fbadeecf305785e2c5fb071255c506eaf95 (diff) | |
| download | ports-c47d80d2e73b9ab2eaa33618a8276effcab6b6ab.tar.gz ports-c47d80d2e73b9ab2eaa33618a8276effcab6b6ab.zip | |
lang/spidermonkey68: fix build on GCC architectures
Use Clang only on clang architectures.
PR: 248635
Approved by: tcberner (maintainer)
Notes
Notes:
svn path=/head/; revision=544791
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/spidermonkey68/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lang/spidermonkey68/Makefile b/lang/spidermonkey68/Makefile index 1194380aa9fe..ac7bb5b25fad 100644 --- a/lang/spidermonkey68/Makefile +++ b/lang/spidermonkey68/Makefile @@ -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 |