aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-08-07 21:47:45 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-08-08 16:33:42 +0000
commit5be07c2b1fbe6372d5c2d7b4d339d530fe209fb4 (patch)
tree49412e0c348143e0c1ea22a4fa4be78ef5bfe1a4
parent6eec3bde9860fdff2bd09b319d63f63e63d23cc1 (diff)
baremetal: Use 'input' target instead of 'product' target
... to get value of cpp.generate{Compiler|Assembler}ListingFiles properties. Change-Id: Iefd1401ac475a7937843a80af021668f0241a8c7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--share/qbs/modules/cpp/iar.js4
-rw-r--r--share/qbs/modules/cpp/keil.js8
2 files changed, 6 insertions, 6 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js
index 621e6ea3d..e57b2a449 100644
--- a/share/qbs/modules/cpp/iar.js
+++ b/share/qbs/modules/cpp/iar.js
@@ -661,7 +661,7 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) {
}
// Listing files generation flag.
- if (product.cpp.generateCompilerListingFiles)
+ if (input.cpp.generateCompilerListingFiles)
args.push("-l", outputs.lst[0].filePath);
// Misc flags.
@@ -721,7 +721,7 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
}
// Listing files generation flag.
- if (product.cpp.generateAssemblerListingFiles)
+ if (input.cpp.generateAssemblerListingFiles)
args.push("-l", outputs.lst[0].filePath);
// Misc flags.
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js
index f66fd4bb2..672e26672 100644
--- a/share/qbs/modules/cpp/keil.js
+++ b/share/qbs/modules/cpp/keil.js
@@ -759,7 +759,7 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) {
}
// Listing files generation flag.
- if (!product.cpp.generateCompilerListingFiles)
+ if (!input.cpp.generateCompilerListingFiles)
args.push("NOPRINT");
else
args.push("PRINT(" + FileInfo.toWindowsSeparators(outputs.lst[0].filePath) + ")");
@@ -849,7 +849,7 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) {
}
// Listing files generation flag.
- if (product.cpp.generateCompilerListingFiles) {
+ if (input.cpp.generateCompilerListingFiles) {
args.push("--list");
args.push("--list_dir", FileInfo.path(outputs.lst[0].filePath));
}
@@ -973,7 +973,7 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
args.push("EP");
// Listing files generation flag.
- if (!product.cpp.generateAssemblerListingFiles)
+ if (!input.cpp.generateAssemblerListingFiles)
args.push("NOPRINT");
else
args.push("PRINT(" + FileInfo.toWindowsSeparators(outputs.lst[0].filePath) + ")");
@@ -1015,7 +1015,7 @@ function assemblerFlags(project, product, input, outputs, explicitlyDependsOn) {
args.push((endianness === "little") ? "--littleend" : "--bigend");
// Listing files generation flag.
- if (product.cpp.generateAssemblerListingFiles)
+ if (input.cpp.generateAssemblerListingFiles)
args.push("--list", outputs.lst[0].filePath);
}