From e2972edcc93d17f8278fe201db0dc7de3cc40ca5 Mon Sep 17 00:00:00 2001 From: riastradh Date: Sat, 4 Aug 2012 04:00:49 +0000 Subject: Fix Cairo hack on Mac OS X. gcc-4.2 is residual from older Xcode installs. If you've installed only the Xcode with a bad compiler, the workaround is no good. But omitting -flto works around the problem too, so do that. --- graphics/cairo/hacks.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'graphics/cairo') diff --git a/graphics/cairo/hacks.mk b/graphics/cairo/hacks.mk index ec93e6218db..a4d7a97f73e 100644 --- a/graphics/cairo/hacks.mk +++ b/graphics/cairo/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.5 2012/06/14 19:53:07 bsiegert Exp $ +# $NetBSD: hacks.mk,v 1.6 2012/08/04 04:00:49 riastradh Exp $ .if !defined(CAIRO_HACKS_MK) CAIRO_HACKS_MK= defined @@ -9,9 +9,9 @@ CAIRO_HACKS_MK= defined ### .if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc) _BAD_GCC_BUILD!= ${CC} --version | (${GREP} -c 'i686-apple-darwin11-llvm-gcc-4\.2\ .*build\ 5658' || ${TRUE}) -. if ${_BAD_GCC_BUILD} == "1" && exists(/usr/bin/gcc-4.2) -PKG_HACKS+= llvm-link -CONFIGURE_ENV+= ac_cv_prog_CC=gcc-4.2 +. if ${_BAD_GCC_BUILD} == "1" +PKG_HACKS+= llvm-lto-hack +BUILDLINK_TRANSFORM+= rm:-flto . endif .endif -- cgit v1.2.3