From e185f343e468da482d50f4dfbd26cf217545a8e7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 2 Aug 2012 12:11:13 +0200
Subject: findLibraries(): don't remove -L options for system paths

the paths may be explicitly added before some other paths, so it would
be wrong to remove them.

Change-Id: I68ae93fd307afe14a07a0f24de952783950b5bea
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qmake/generators/unix/unixmake.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'qmake')

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 31b1d0d1d2..01cfeb41b4 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -478,7 +478,8 @@ UnixMakefileGenerator::findLibraries()
                 if(opt.startsWith("-L")) {
                     QString lib = opt.mid(2);
                     QMakeLocalFileName f(lib);
-                    if (libdirs.contains(f)) {
+                    int idx = libdirs.indexOf(f);
+                    if (idx >= 0 && idx < libidx) {
                         it = l.erase(it);
                         continue;
                     }
-- 
cgit v1.2.3