From owner-svn-ports-all@freebsd.org Thu Aug 13 09:03:53 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 23C503BB7E5; Thu, 13 Aug 2020 09:03:53 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BS0x5093Cz43p2; Thu, 13 Aug 2020 09:03:53 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD1A71AC7A; Thu, 13 Aug 2020 09:03:52 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07D93qHr009371; Thu, 13 Aug 2020 09:03:52 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07D93q9u009369; Thu, 13 Aug 2020 09:03:52 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202008130903.07D93q9u009369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 13 Aug 2020 09:03:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544791 - head/lang/spidermonkey68 X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/lang/spidermonkey68 X-SVN-Commit-Revision: 544791 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2020 09:03:53 -0000 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 @@ -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