Changeset 34 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

Jun 17, 2009, 9:33:02 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/GNUMAKE: Remove commonly used -l and -L from the beginning of installation-defined libraries and library paths before prepending a compiler-dependent option.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -310 +310 @@
         for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
             QString lib = maybeQuotePath(*it);
+            /* 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"))
+                lib = lib.mid(2);
             t << " " << opt << lib;
         }
@@ -322 +327 @@
     for(QStringList::Iterator it = libDirs.begin(); it != libDirs.end(); ++it) {
         QString libDir = maybeQuotePath(*it);
+        /* libDir 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 (libDir.startsWith("-L"))
+            libDir = libDir.mid(2);
         t << " " << opt << libDir;
     }