Make configure.exe only detect each compiler once

When reading the registry on a 64 bit Windows, the same compiler
can be detected twice, breaking the -platform detection even when
only one compiler is in the path.
Fix this by taking advantage of the CompilerInfo struct ordering
and ignore detection of the same compiler.

Change-Id: I583230520d2e0859196f9d7c8af31adbb981a6ca
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit fa5cf01e7468e53508b15726625fd681892119a4)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 29 insertions, 9 deletions

diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 72d9e5c..34aa78c 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -167,8 +167,18 @@ Compiler Environment::detectCompiler()
             QStringList::iterator it;
             for(it = pathlist.begin(); it != pathlist.end(); ++it) {
                 if((*it).contains(productPath)) {
-                    ++installed;
-                    detectedCompiler = compiler_info[i].compiler;
+                    if (detectedCompiler != compiler_info[i].compiler) {
+                        ++installed;
+                        detectedCompiler = compiler_info[i].compiler;
+                    }
+                    /* else {
+
+                        We detected the same compiler again, which happens when
+                        configure is run on a 64 bit Windows. Skip the
+                        duplicate so that we don't think it's installed twice.
+
+                    }
+                    */
                     break;
                 }
             }
@@ -180,14 +190,24 @@ Compiler Environment::detectCompiler()
         for(int i = 0; compiler_info[i].compiler; ++i) {
             QString executable = QString(compiler_info[i].executable).toLower();
             if (executable.length() && Environment::detectExecutable(executable)) {
-                ++installed;
-                detectedCompiler = compiler_info[i].compiler;
-                if (detectedCompiler == CC_MINGW) {
-                    bool is64bit;
-                    const int version = detectGPlusPlusVersion(executable, &is64bit);
-                    if (version < 0x040600)
-                        detectedCompiler = CC_MINGW_44;
+                if (detectedCompiler != compiler_info[i].compiler) {
+                    ++installed;
+                    detectedCompiler = compiler_info[i].compiler;
+                    if (detectedCompiler == CC_MINGW) {
+                        bool is64bit;
+                        const int version = detectGPlusPlusVersion(executable, &is64bit);
+                        if (version < 0x040600)
+                            detectedCompiler = CC_MINGW_44;
+                    }
+                }
+                /* else {
+
+                    We detected the same compiler again, which happens when
+                    configure is run on a 64 bit Windows. Skip the
+                    duplicate so that we don't think it's installed twice.
+
                 }
+                */
                 break;
             }
         }