1 files changed, 15 insertions, 8 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 50ec8db79e..7f42fbe09e 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -399,6 +399,8 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
         libdirs.append(QMakeLocalFileName(dlib.toQString()));
     frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks"));
     frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks"));
+    ProStringList extens;
+    extens << project->first("QMAKE_EXTENSION_SHLIB") << "a";
     static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
                                            "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
     for (int i = 0; lflags[i]; i++) {
@@ -417,8 +419,6 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                     libdirs.insert(libidx++, f);
                 } else if(opt.startsWith("-l")) {
                     QString lib = opt.mid(2);
-                    ProStringList extens;
-                    extens << project->first("QMAKE_EXTENSION_SHLIB") << "a";
                     for (QList<QMakeLocalFileName>::Iterator dep_it = libdirs.begin();
                          dep_it != libdirs.end(); ++dep_it) {
                         QString libBase = (*dep_it).local() + '/'
@@ -506,23 +506,30 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                             if (opt.startsWith("-Xarch"))
                                 opt = l.at(++lit); // The user has done the right thing and prefixed each part
                         }
-                        bool found = false;
                         for(int x = 0; x < lflags[arch].size(); ++x) {
                             if (lflags[arch].at(x) == "-framework" && lflags[arch].at(++x) == opt) {
-                                found = true;
+                                lflags[arch].remove(x - 1, 2);
                                 break;
                             }
                         }
-                        if(!found) {
-                            lflags[arch].append("-framework");
-                            lflags[arch].append(opt);
-                        }
+                        lflags[arch].append("-framework");
+                        lflags[arch].append(opt);
                     } else {
                         lflags[arch].append(opt);
                     }
                 } else if(!opt.isNull()) {
+                    for (const ProString &ext : extens) {
+                        if (opt.size() > ext.size() && opt.endsWith(ext)
+                                && opt.at(opt.size() - ext.size() - 1) == '.') {
+                            // Make sure we keep the dependency order of libraries
+                            lflags[arch].removeAll(opt);
+                            lflags[arch].append(opt);
+                            goto found2;
+                        }
+                    }
                     if(!lflags[arch].contains(opt))
                         lflags[arch].append(opt);
+                  found2: ;
                 }
             }