From 8cbc47ec49295c502ec91a71848f8ba3a1fe9b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 16 Jan 2014 19:41:11 +0100 Subject: [PATCH] Don't pass -mfpmath=sse to Clang < 3.4, it's not supported Change-Id: I875f72802d8745488d34f836818b21aafe69dcff Reviewed-by: Thiago Macieira --- mkspecs/features/qt_module.prf | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index c83133075b..32a722fb53 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -137,7 +137,17 @@ sse2:!contains(QT_CPU_FEATURES.$$QT_ARCH, sse2):!host_build:!if(static:contains( QMAKE_CFLAGS += $$QMAKE_CFLAGS_SSE2 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 } -gcc:equals(QT_ARCH, i386):contains(QT_CPU_FEATURES.$$QT_ARCH, sse2) { + +clang { + apple_clang_ver = $${QT_APPLE_CLANG_MAJOR_VERSION}.$${QT_APPLE_CLANG_MINOR_VERSION} + reg_clang_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} + !lessThan(apple_clang_ver, "5.1")|!lessThan(reg_clang_ver, "3.4"): \ + CONFIG += compiler_supports_fpmath +} else: gcc { + CONFIG += compiler_supports_fpmath +} + +equals(QT_ARCH, i386):contains(QT_CPU_FEATURES.$$QT_ARCH, sse2):compiler_supports_fpmath { # Turn on SSE-based floating-point math QMAKE_CFLAGS += -mfpmath=sse QMAKE_CXXFLAGS += -mfpmath=sse