Index: head/lang/spidermonkey68/Makefile
===================================================================
--- head/lang/spidermonkey68/Makefile	(revision 544790)
+++ head/lang/spidermonkey68/Makefile	(revision 544791)
@@ -1,79 +1,79 @@
 # $FreeBSD$
 
 PORTNAME=	spidermonkey
 DISTVERSION=	68.9.0
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 PKGNAMESUFFIX=	${SP_VER}
 DISTNAME=	firefox-${DISTVERSION}esr.source
 
 MAINTAINER=	tcberner@FreeBSD.org
 COMMENT=	Standalone JavaScript based from Mozilla 68-esr
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213 \
 		${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
 		rust-cbindgen>=0.8.7:devel/rust-cbindgen \
 		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
 		${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 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
 HAS_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/firefox-${DISTVERSION}
 PATCH_WRKSRC=		${WRKDIR}/firefox-${DISTVERSION}/
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_SCRIPT=	../firefox-${DISTVERSION}/js/src/configure
 
 CONFIGURE_ARGS=	--prefix=${PREFIX:Q} \
 		--target=${CONFIGURE_TARGET} \
 		--with-intl-api \
 		--with-system-zlib \
 		--disable-gold \
 		--disable-debug \
 		--disable-debug-symbols \
 		--disable-jemalloc \
 		--with-system-icu \
 		--with-system-nspr \
 		--enable-shared-js \
 		--enable-optimize \
 		--enable-readline
 
 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>
 
 .if ${ARCH} == amd64
 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
 	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js${SP_VER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.*
 
 .include <bsd.port.post.mk>