Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/lang/gcc6/Makefile	2017/11/13 19:36:26	1.11
+++ pkgsrc/lang/gcc6/Makefile	2018/01/28 16:24:14	1.13
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/11/13 19:36:26 maya Exp $
+# $NetBSD: Makefile,v 1.13 2018/01/28 16:24:14 wiz Exp $
 
 GCC_PKGNAME=		gcc6
 .include		"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC6_DIST_VERS
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc6-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/}
 EXTRACT_SUFX=	.tar.xz
@@ -66,6 +66,15 @@ BOOT_LDFLAGS+=		${LDFLAGS:M-Wl,-syslibro
 # GCC does not understand this option; remove it, or stage build will fail
 BUILDLINK_TRANSFORM+=	rm:-stdlib=libc++
 
+# Disable fixincludes on SmartOS, header changes result in broken includes
+# being generated, see https://github.com/joyent/pkgsrc-legacy/issues/270
+.if ${OS_VARIANT} == "SmartOS"
+SUBST_CLASSES+=		fixinc
+SUBST_STAGE.fixinc=	pre-configure
+SUBST_FILES.fixinc=	gcc/Makefile.in
+SUBST_SED.fixinc=	-e "s,\./fixinc.sh,-c true,"
+.endif
+
 .include "options.mk"
 
 ## For graphite support.