summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2007-07-27 10:31:45 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2007-07-27 10:31:45 +0000
commit902b1b5d70c6590244badb51f35d1aa6c6507e42 (patch)
tree0b5bfe8bf4502787e096c50663b599d32cdcb29e /Mk
parent- Update to 2.18 (diff)
The bug that makes gcc 3.4 choke on some amd64 inline assembler does not
only affect the Qt4 core ports but ports depending on them as well, so try a more sweeping approach for a workaround.
Notes
Notes: svn path=/head/; revision=196381
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.qt.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 58a24f10708c..6e819a515386 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -45,8 +45,13 @@ UIC?= ${QT_PREFIX}/bin/uic-qt4
QMAKE?= ${QT_PREFIX}/bin/qmake-qt4
QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
+.if ${OSVERSION} < 700042 && ${ARCH} == "amd64"
+QTCPPFLAGS?= -fno-gcse
+.else
QTCPPFLAGS?=
+.endif
QTCGFLIBS?=
+
.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
QT4_VERSION?= 4.3.0