diff options
author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2013-11-11 16:47:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-14 19:26:20 +0100 |
commit | cad65f2632ab887184f33d9b6ccb4b60fa54f481 (patch) | |
tree | 31084146ebb3d8e1242ee2877ab9dbe0bb986d2b /tools | |
parent | c887fbd79503824882df08365e39d27580164ac9 (diff) |
Detect architecture before auto detection
Some compile checks may depend on the architecture,
e.g., NEON is only available for ARM, so it makes no
sense to check it for this architecture. Therefore
we need to run the architecture check before we
auto detect settings.
Task-number: QTBUG-34743
Change-Id: I53208d25b0ae0fd93cccc7394307b8ee286576a2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 3 | ||||
-rw-r--r-- | tools/configure/main.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c67b245228..67333457a7 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2212,6 +2212,9 @@ void Configure::autoDetection() { cout << "Running configuration tests..." << endl; + // Auto-detect CPU architectures. + detectArch(); + if (dictionary["C++11"] == "auto") { if (!dictionary["QMAKESPEC"].contains("msvc")) dictionary["C++11"] = tryCompileProject("common/c++11") ? "yes" : "no"; diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index fb815b287e..1e6aa3f298 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -94,9 +94,6 @@ int runConfigure( int argc, char** argv ) // Auto-detect modules and settings. app.autoDetection(); - // ... and the CPU architectures. - app.detectArch(); - // After reading all command-line arguments, and doing all the // auto-detection, it's time to do some last minute validation. // If the validation fails, we cannot continue. |