AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove outdated check for Apple Clang 2.x and 3.x

Browse Source 
The minimum version of Xcode that we support is 5.1 (based on Clang 3.4)

Change-Id: I536c32a88bff44dab37afffd14a11f709fb25169
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Thiago Macieira 2017-02-07 13:45:20 -08:00
parent 8798d03e7e
commit b6bf2a33f4
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.json
View File

@ -314,10 +314,6 @@
"type": "compile", "type": "compile",
"test": "common/avx" "test": "common/avx"
}, },
"avx_apple_clang": {
"label": "bugfree AVX support in compiler",
"type": "avx_test_apple_clang"
},
"avx2": { "avx2": {
"label": "AVX2 instructions", "label": "AVX2 instructions",
"type": "compile", "type": "compile",
@ -751,7 +747,7 @@
}, },
"avx": { "avx": {
"label": "AVX", "label": "AVX",
"condition": "features.sse4_2 && tests.avx && tests.avx_apple_clang", "condition": "features.sse4_2 && tests.avx",
"output": [ "output": [
"privateConfig", "privateConfig",
{ "type": "define", "name": "QT_COMPILER_SUPPORTS_AVX", "value": 1 } { "type": "define", "name": "QT_COMPILER_SUPPORTS_AVX", "value": 1 }

12
configure.pri
View File

@ -274,18 +274,6 @@ defineTest(qtConfTest_architecture) {
return(true) 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) { defineTest(qtConfTest_gnumake) {
make = $$qtConfFindInPath("gmake") make = $$qtConfFindInPath("gmake")
isEmpty(make): make = $$qtConfFindInPath("make") isEmpty(make): make = $$qtConfFindInPath("make")