diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-10-12 17:12:44 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-10-13 12:23:54 +0000 |
| commit | 7f47efe5beb4fb2a7ef39d7e2f61fedce9ac3121 (patch) | |
| tree | b08636f331cb4806afc0e85141464e9a57378feb | |
| parent | 40327c8277b904944dbd9a227f9a819e3d53666d (diff) | |
GCC: Filter compiler built-ins from list of library paths
... rather than the paths of the dynamic linker.
Amends 8d75be48c2bbe314390ff292e3a26c5403a5896a, which was based on a
false analogy with rpaths.
Fixes: QBS-1436
Change-Id: I5c8c64f22d65b07a43d7a9ca097ff450a16b738a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index d9213e951..b60608682 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -406,8 +406,8 @@ function linkerFlags(project, product, inputs, outputs, primaryOutput, linkerPat // Flags for library search paths var allLibraryPaths = Cpp.collectLibraryPaths(product); - if (systemRunPaths.length > 0) - allLibraryPaths = allLibraryPaths.filter(isNotSystemRunPath); + var builtIns = product.cpp.compilerLibraryPaths + allLibraryPaths = allLibraryPaths.filter(function(p) { return !builtIns.includes(p); }); args = args.concat(allLibraryPaths.map(function(path) { return product.cpp.libraryPathFlag + path })); escapableLinkerFlags = escapableLinkerFlags.concat(Cpp.collectLinkerScriptPathsArguments(product, inputs)); |