summaryrefslogtreecommitdiff
path: root/share/qbs/modules/cpp/gcc.js
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-06-26 08:04:56 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-06-26 08:04:56 +0000
commitdb351f78a672cc9ecf50eae01385675348cd1920 (patch)
tree3c4413322f981ab50a4d1800238b1152b4d7dcea /share/qbs/modules/cpp/gcc.js
parent3a01ca5fc926faeb08a4a2734f5cf45835dd2014 (diff)
parent5977edbe7bc2d259340e9dfc1e0e4314bc003176 (diff)
downloadqbs-db351f78a672cc9ecf50eae01385675348cd1920.tar.gz
Merge "Merge 1.8 into master"
Diffstat (limited to 'share/qbs/modules/cpp/gcc.js')
-rw-r--r--share/qbs/modules/cpp/gcc.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index fba46f879..c8ee9eeaf 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -387,6 +387,9 @@ function linkerFlags(project, product, inputs, output, linkerPath) {
product, inputs, product.cpp.platformLinkerFlags));
args = args.concat(escapeLinkerFlags(product, inputs, product.cpp.linkerFlags));
+ // Note: due to the QCC response files hack in prepareLinker(), at least one object file or
+ // library file must follow the output file path so that QCC has something to process before
+ // sending the rest of the arguments through the response file.
args.push("-o", output.filePath);
if (inputs.obj)