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>

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";

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.