Changeset 57 for trunk/qmake

Timestamp:

Jun 26, 2009, 12:46:18 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/GNUMAKE: There may be things like -L<some_path> in LIBS variables which would appear as -l-L<some_path> in generated Makefiles; fixed now.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -320 +320 @@
             writeLibDirPart(t);
         QString opt = var("QMAKE_LFLAGS_LIB");
+        QString optL = var("QMAKE_LFLAGS_LIBDIR");
         QStringList libs = project->values("QMAKE_LIBS");
         for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
@@ -325 +326 @@
             /* lib may be prefixed with -l which is commonly used in e.g. PRF
              * (feature) files on all platforms; remove it before prepending
-             * the compiler-specific option */
-            if (lib.startsWith("-l"))
+             * the compiler-specific option. There is even more weird case
+             * when LIBS contains library paths prefixed with -L; we detect
+             * this as well and replace it with the proper option. */
+            if (lib.startsWith("-L")) {
                 lib = lib.mid(2);
-            t << " " << opt << lib;
+                t << " " << optL << lib;
+            } else {
+                if (lib.startsWith("-l"))
+                    lib = lib.mid(2);
+                t << " " << opt << lib;
+            }
         }
         t << endl;