diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-07 15:33:39 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-08 08:02:06 +0000 |
commit | f5fab1a63ddcc11fd467d7897f89e3448335115a (patch) | |
tree | 6d91f1b95da4c359a39f6e4a0248833b5a66687d | |
parent | edf90ff88b1f95d36b8506437e76fc7d21991d6f (diff) |
GCC: Fix input tags for static libraries
We forgot to adapt the static library rule back when we implemented
smart relinking.
Change-Id: Iea952c868ca7b5c0bda89690865d554be4893bb5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 2 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs | 8 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/smart-relinking/staticlib.cpp | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 5676d62e0..792e8ef4c 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -456,7 +456,7 @@ CppModule { condition: product.cpp.shouldLink multiplex: true inputs: ["obj", "linkerscript"] - inputsFromDependencies: ["dynamiclibrary", "staticlibrary"] + inputsFromDependencies: ["dynamiclibrary_symbols", "staticlibrary"] outputFileTags: ["bundle.input", "staticlibrary", "c_staticlibrary", "cpp_staticlibrary"] outputArtifacts: { diff --git a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs index 049ade899..44d8013b9 100644 --- a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs +++ b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs @@ -25,6 +25,14 @@ Project { condition: tcProbe.found name:"app" Depends { name: "lib" } + Depends { name: "staticlib" } files: ["main.cpp"] } + StaticLibrary { + condition: tcProbe.found + name: "staticlib" + Depends { name: "lib" } + Depends { name: "cpp" } + files: "staticlib.cpp" + } } diff --git a/tests/auto/blackbox/testdata/smart-relinking/staticlib.cpp b/tests/auto/blackbox/testdata/smart-relinking/staticlib.cpp new file mode 100644 index 000000000..24fd8c6e9 --- /dev/null +++ b/tests/auto/blackbox/testdata/smart-relinking/staticlib.cpp @@ -0,0 +1 @@ +static void myFunc() {} |