[src/trunk]: src/external/mit/xorg/lib/libXft Restrict workaround to GCC 4.8 ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/781ceee5a915
branches:  trunk
changeset: 804035:781ceee5a915
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Nov 21 01:11:50 2014 +0000

description:
Restrict workaround to GCC 4.8 as intended.

diffstat:

 external/mit/xorg/lib/libXft/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r d6233599c98b -r 781ceee5a915 external/mit/xorg/lib/libXft/Makefile
--- a/external/mit/xorg/lib/libXft/Makefile     Fri Nov 21 00:51:09 2014 +0000
+++ b/external/mit/xorg/lib/libXft/Makefile     Fri Nov 21 01:11:50 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/11/20 02:00:19 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.7 2014/11/21 01:11:50 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,9 +20,9 @@
 CPPFLAGS+=     -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/Xft
 
-.if !empty(MACHINE_ARCH:Mearm*)
+.if !empty(MACHINE_ARCH:Mearm*) && ${HAVE_GCC:U} == 48
 # Workaround a crash in XftGlyphSpecRender with GCC 4.8.4
-COPTS.xftrender.c+= -O0
+COPTS.xftrender.c+= ${${ACTIVE_CC} == "gcc" :? -O0 :}
 .endif
 
 LIBDPLIBS=     X11             ${.CURDIR}/../libX11/dynamic \