1 files changed, 7 insertions, 5 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index ac458b66dc..01b15b9ee1 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -149,13 +149,15 @@ UnixMakefileGenerator::init()
         for(int i = 0; i < libdirs.size(); ++i) {
             if(!project->isEmpty("QMAKE_LFLAGS_RPATH") && project->isActiveConfig("rpath_libdirs"))
                 project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + libdirs[i];
-            ldadd << "-L" + escapeFilePath(libdirs[i]);
+            project->values("QMAKE_LIBDIR_FLAGS") += "-L" + escapeFilePath(libdirs[i]);
         }
     }
-    if(project->isActiveConfig("macx") && !project->isEmpty("QMAKE_FRAMEWORKPATH")) {
-        const QStringList &fwdirs = project->values("QMAKE_FRAMEWORKPATH");
-        for(int i = 0; i < fwdirs.size(); ++i) {
-            project->values("QMAKE_FRAMEWORKPATH_FLAGS") += "-F" + escapeFilePath(fwdirs[i]);
+    ldadd += project->values("QMAKE_LIBDIR_FLAGS");
+    if (project->isActiveConfig("macx")) {
+        if (!project->isEmpty("QMAKE_FRAMEWORKPATH")) {
+            const QStringList &fwdirs = project->values("QMAKE_FRAMEWORKPATH");
+            for (int i = 0; i < fwdirs.size(); ++i)
+                project->values("QMAKE_FRAMEWORKPATH_FLAGS") += "-F" + escapeFilePath(fwdirs[i]);
         }
         ldadd += project->values("QMAKE_FRAMEWORKPATH_FLAGS");
     }