Index: base/binutils/Makefile
===================================================================
--- base/binutils/Makefile
+++ base/binutils/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTEPOCH=	0
+PORTREVISION=	1
 CATEGORIES=	base
 PKGNAMEPREFIX=	${OPSYS:tl}-
 VALID_CATEGORIES=	base
Index: base/binutils/files/binutils.mk
===================================================================
--- /dev/null
+++ base/binutils/files/binutils.mk
@@ -0,0 +1,4 @@
+CROSS_BINUTILS_PREFIX=/usr/bin/
+export WITH_PORT_BASE_BINUTILS=yes
+export WITHOUT_BINUTILS=yes
+export WITHOUT_LLD_IS_LD=yes
Index: base/binutils/pkg-plist
===================================================================
--- base/binutils/pkg-plist
+++ base/binutils/pkg-plist
@@ -573,3 +573,4 @@
 share/man/man1/%%BUTARGET%%-ld.1.gz
 %%OBJCOPY%%share/man/man1/%%BUTARGET%%-objcopy.1.gz
 share/man/man1/%%BUTARGET%%-objdump.1.gz
+share/toolchains/binutils.mk
Index: base/gcc/Makefile
===================================================================
--- base/gcc/Makefile
+++ base/gcc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	base
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION} \
 		http://www.mpfr.org/mpfr-3.1.6/:mpfr \
@@ -118,5 +118,7 @@
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 	${RM} ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains
+	${INSTALL_DATA} ${FILESDIR}/gcc.mk ${STAGEDIR}${PREFIX}/share/toolchains/
 
 .include <bsd.port.mk>
Index: base/gcc/files/gcc.mk
===================================================================
--- /dev/null
+++ base/gcc/files/gcc.mk
@@ -0,0 +1,7 @@
+XCC=/usr/bin/cc
+XCXX=/usr/bin/c++
+XCPP=/usr/bin/cpp
+X_COMPILER_TYPE=gcc
+export WITH_PORT_BASE_GCC=yes
+export WITHOUT_GCC=yes
+export WITHOUT_CLANG_IS_CC=yes
Index: base/gcc/pkg-plist
===================================================================
--- base/gcc/pkg-plist
+++ base/gcc/pkg-plist
@@ -520,3 +520,4 @@
 share/man/man7/fsf-funding.7.gz
 share/man/man7/gfdl.7.gz
 share/man/man7/gpl.7.gz
+share/toolchains/gcc.mk
Index: devel/binutils/Makefile
===================================================================
--- devel/binutils/Makefile
+++ devel/binutils/Makefile
@@ -150,6 +150,8 @@
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib
 .endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains
+	${INSTALL_DATA} ${.CURDIR}/files/binutils.mk ${STAGEDIR}${PREFIX}/share/toolchains/
 .endif
 .for tool in ${BUREMOVE}
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \