diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-12 10:52:01 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-12 12:02:45 +0000 |
| commit | a5f2a7820fb7ac011409732a4d462b10ac08edf3 (patch) | |
| tree | 03575d82c62a8e95e649d554deb57a58ece1693c | |
| parent | fcfe81df8cfeb2c6439e419e92e02e75a9d2d6ec (diff) | |
cpp.setupRunEnvironment: Ignore rpaths
We did not set any environment *PATH variables if any rpaths were
present, which breaks the functionality if some libraries are found via
rpaths and others are not. So let's ignore the presence of rpaths.
Change-Id: I41d690159a51bb8e38acd83667bff53ad86c3714
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/setuprunenv.js | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/share/qbs/modules/cpp/setuprunenv.js b/share/qbs/modules/cpp/setuprunenv.js index dcbe5b273..dfc30d20c 100644 --- a/share/qbs/modules/cpp/setuprunenv.js +++ b/share/qbs/modules/cpp/setuprunenv.js @@ -57,13 +57,6 @@ function addExternalLibPath(product, list, path) function gatherPaths(product, libPaths, frameworkPaths) { - // Heuristic: If any rpaths are set, assume environment paths should not be set up. - // Let's not try to be super fancy, evaluating all the rpaths, expanding $ORIGIN, relative paths - // and whatnot. - if (!product.qbs.targetOS.contains("windows") && product.cpp && product.cpp.useRPaths - && product.cpp.rpaths && product.cpp.rpaths.length > 0) - return; - // Gather explicitly given library paths. if (product.cpp && product.cpp.libraryPaths) product.cpp.libraryPaths.forEach(function(p) { addExternalLibPath(product, libPaths, p); }); |