qmake: Always split QMAKE_DEFAULT_LIBDIRS using ; with clang on windows

When building in a unix style build system (i.e. msys), QMAKE_DIRLIST_SEP is a colon, not a semicolon. Thus, always split the incoming string (after the fixup regex) using semicolons on windows. This matches the code for gcc, further up, which does: equals(QMAKE_HOST.os, Windows): \ paths = $$split(line, ;) else: \ paths = $$split(line, $$QMAKE_DIRLIST_SEP) Change-Id: I6a0175f9d14ae9ca188553483b7868f0549c784a Reviewed-by: Joerg Bornemann <[email protected]>
lee-vius · Apr 25, 2019 · 65a33d7 · 65a33d7
1 parent fc2e9ac
commit 65a33d7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
@@ -267,9 +267,13 @@ isEmpty($${target_prefix}.INCDIRS) {
             for (line, output) {
                 contains(line, "^libraries: .*") {
                     line ~= s,^libraries: ,,
-                    # clang (7.x) on Windows uses the wrong path list separator ...
-                    equals(QMAKE_HOST.os, Windows): line ~= s,:(?![/\\\\]),;,
-                    paths = $$split(line, $$QMAKE_DIRLIST_SEP)
+                    equals(QMAKE_HOST.os, Windows) {
+                        # clang (7.x) on Windows uses the wrong path list separator ...
+                        line ~= s,:(?![/\\\\]),;,
+                        paths = $$split(line, ;)
+                    } else {
+                        paths = $$split(line, $$QMAKE_DIRLIST_SEP)
+                    }
                     for (path, paths): \
                         QMAKE_DEFAULT_LIBDIRS += $$clean_path($$replace(path, ^=, $$[SYSROOT]))
                 }