svn commit: r316077 - head/sys/boot/i386/gptzfsboot

[Ngie Cooper]

Author: ngie
Date: Tue Mar 28 07:01:40 2017
New Revision: 316077
URL: https://svnweb.freebsd.org/changeset/base/316077

Log:
  Unbreak compilation with gcc 4.2.1
  
  -Wtentative-definition-incomplete-type isn't implemented for 4.2.1
  
  X-MFC with:	r304321
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/boot/i386/gptzfsboot/Makefile

Modified: head/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptzfsboot/Makefile	Tue Mar 28 06:39:54 2017	(r316076)
+++ head/sys/boot/i386/gptzfsboot/Makefile	Tue Mar 28 07:01:40 2017	(r316077)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \
 		${.CURDIR}/../zfsboot ${.CURDIR}/../common \
 		${.CURDIR}/../../common ${.CURDIR}/../../../crypto/skein
@@ -34,7 +36,12 @@ CFLAGS=	-DBOOTPROG=\"gptzfsboot\" \
 	-Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline -Wno-tentative-definition-incomplete-type -Wno-pointer-sign
+	-Winline -Wno-pointer-sign
+
+.if ${COMPILER_TYPE} == "clang" || \
+    (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201)
+CFLAGS+=	-Wno-tentative-definition-incomplete-type
+.endif
 
 # Do not unroll skein loops, reduce code size
 CFLAGS+=	-DSKEIN_LOOP=111