aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp/msvc.js
diff options
context:
space:
mode:
Diffstat (limited to 'share/qbs/modules/cpp/msvc.js')
-rw-r--r--share/qbs/modules/cpp/msvc.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index b8464a651..cb8c48482 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -319,8 +319,15 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
if (ModUtils.moduleProperty(product, "allowUnresolvedSymbols"))
args.push("/FORCE:UNRESOLVED");
+ var linkerPath = product.moduleProperty("cpp", "linkerPath");
+ var wrapperArgs = product.moduleProperty("cpp", "linkerWrapper");
+ if (wrapperArgs && wrapperArgs.length > 0) {
+ args.unshift(linkerPath);
+ linkerPath = wrapperArgs.shift();
+ args = wrapperArgs.concat(args);
+ }
var commands = [];
- var cmd = new Command(product.moduleProperty("cpp", "linkerPath"), args)
+ var cmd = new Command(linkerPath, args)
cmd.description = 'linking ' + primaryOutput.fileName;
cmd.highlight = 'linker';
cmd.workingDirectory = FileInfo.path(primaryOutput.filePath)