From b32faf9b96b0ee446e0cf37e03b8056d21bb8122 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Thu, 13 May 2010 12:05:35 +0000
Subject: [PATCH] When setting -finline-limit=60 on hppa, don't override
 CXXFLAGS but append to it instead. Noticed by sthen@ ages ago, ok espie@

---
 x11/qt4/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile
index a9985face5b..1af97219113 100644
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2010/05/09 18:38:08 espie Exp $
+# $OpenBSD: Makefile,v 1.69 2010/05/13 12:05:35 landry Exp $
 
 COMMENT-debug =		C++ GUI toolkit, debug
 COMMENT-main =		C++ X11 GUI toolkit
@@ -121,8 +121,8 @@ CONFIGURE_ENV =		LOCALBASE=${LOCALBASE} QTDIR="${WRKSRC}" \
 
 # fix to avoid gcc generating a huge uncompilable intermediate assembly
 .if ${MACHINE_ARCH} == "hppa"
-CXXFLAGS =		-finline-limit=60
-CONFIGURE_ENV +=	OPENSOURCE_CXXFLAGS=${CXXFLAGS}
+CXXFLAGS +=		-finline-limit=60
+CONFIGURE_ENV +=	OPENSOURCE_CXXFLAGS="${CXXFLAGS}"
 .endif
 
 BUILD_DEPENDS +=	::print/cups