diff options
-rw-r--r-- | tools/configure/environment.cpp | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index ae378f6b41..b9af9eca8f 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -162,8 +162,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 build with the 64-bit compiler. Skip the + duplicate so that we don't think it's installed twice. + + } + */ break; } } @@ -175,8 +185,18 @@ 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 != compiler_info[i].compiler) { + ++installed; + detectedCompiler = compiler_info[i].compiler; + } + /* else { + + We detected the same compiler again, which happens when + configure is build with the 64-bit compiler. Skip the + duplicate so that we don't think it's installed twice. + + } + */ break; } } |