summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-09-26 18:05:21 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-09-27 14:41:37 +0000
commitaec975a3f95f905b2d63ea1500ace28eddea7b9e (patch)
treea9aad79a4156c5092da071bcb131fcb7c01f0c88
parent94fe404a5a6d7cf91926bcfbd026953994b25815 (diff)
baremetal: Fix assembler command for SDCC compilerv1.14.0
We need to use the assembler command in the followiong format: Usage: [-Options] outfile file1 [file2 file3 ...] Besides, we have added an additional assembler option '-l' to explicitly generate of a listing file; without of this option the linking fails. Change-Id: I0240b354f44edac94e3e4305fe6b1a4c34ca4bf9 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--share/qbs/modules/cpp/sdcc.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/sdcc.js b/share/qbs/modules/cpp/sdcc.js
index 2f148d2c2..9e7c8097e 100644
--- a/share/qbs/modules/cpp/sdcc.js
+++ b/share/qbs/modules/cpp/sdcc.js
@@ -252,8 +252,6 @@ function assemblerFlags(project, product, input, output, explicitlyDependsOn) {
var tag = ModUtils.fileTagForTargetLanguage(input.fileTags.concat(output.fileTags));
var args = [];
- args.push(input.filePath);
- args.push("-o", output.filePath);
var allIncludePaths = [];
var systemIncludePaths = input.cpp.systemIncludePaths;
@@ -267,6 +265,10 @@ function assemblerFlags(project, product, input, output, explicitlyDependsOn) {
args = args.concat(ModUtils.moduleProperty(input, "platformFlags", tag),
ModUtils.moduleProperty(input, "flags", tag),
ModUtils.moduleProperty(input, "driverFlags", tag));
+
+ args.push("-ol");
+ args.push(output.filePath);
+ args.push(input.filePath);
return args;
}