Module Name: src
Committed By: joerg
Date: Fri Nov 21 01:11:50 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libXft: Makefile
Log Message:
Restrict workaround to GCC 4.8 as intended.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libXft/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXft/Makefile
diff -u src/external/mit/xorg/lib/libXft/Makefile:1.6 src/external/mit/xorg/lib/libXft/Makefile:1.7
--- src/external/mit/xorg/lib/libXft/Makefile:1.6 Thu Nov 20 02:00:19 2014
+++ src/external/mit/xorg/lib/libXft/Makefile Fri Nov 21 01:11:50 2014
@@ -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+= ${X11FLAGS.THREADLIB}
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 \
