diff options
| -rw-r--r-- | configure.json | 6 | ||||
| -rw-r--r-- | configure.pri | 12 |
2 files changed, 1 insertions, 17 deletions
diff --git a/configure.json b/configure.json index 9a9645a23a..c69c2ac0f8 100644 --- a/configure.json +++ b/configure.json @@ -314,10 +314,6 @@ "type": "compile", "test": "common/avx" }, - "avx_apple_clang": { - "label": "bugfree AVX support in compiler", - "type": "avx_test_apple_clang" - }, "avx2": { "label": "AVX2 instructions", "type": "compile", @@ -751,7 +747,7 @@ }, "avx": { "label": "AVX", - "condition": "features.sse4_2 && tests.avx && tests.avx_apple_clang", + "condition": "features.sse4_2 && tests.avx", "output": [ "privateConfig", { "type": "define", "name": "QT_COMPILER_SUPPORTS_AVX", "value": 1 } diff --git a/configure.pri b/configure.pri index 74eef36667..a5e77411ee 100644 --- a/configure.pri +++ b/configure.pri @@ -274,18 +274,6 @@ defineTest(qtConfTest_architecture) { return(true) } -defineTest(qtConfTest_avx_test_apple_clang) { - !*g++*:!*-clang*: return(true) - - qtRunLoggedCommand("$$QMAKE_CXX --version", compiler)|return(false) - contains(compiler, "Apple clang version [23]") { - # Some clang versions produce internal compiler errors compiling Qt AVX code - return(false) - } else { - return(true) - } -} - defineTest(qtConfTest_gnumake) { make = $$qtConfFindInPath("gmake") isEmpty(make): make = $$qtConfFindInPath("make") |