diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-09-24 12:02:51 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-10-01 14:14:07 +0000 |
commit | eed1db08c739fd22eb00e55206eb7b28310d79d0 (patch) | |
tree | ceb9ce42ca0b5aac933fa85f441cb15d11febd9f /share/qbs/modules/cpp/keil.js | |
parent | 37ef97bfa812a9a6f90b0513d31bd83bf7ce2a87 (diff) |
Refactor the map file generation property
1. It is makes sense to define this property once inside of
CppModule, instead of duplicate it in each other module.
2. A new property name 'generateLinkerMapFile' will be better
than a previous, so, we can rename this property.
3. The map file generation is not necessary to be always
enabled, so, we can disable this property by default.
Change-Id: I0439e8b3e0273593c8456d32b1c099ff09498fad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/keil.js')
-rw-r--r-- | share/qbs/modules/cpp/keil.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js index 4b3665715..fc485373b 100644 --- a/share/qbs/modules/cpp/keil.js +++ b/share/qbs/modules/cpp/keil.js @@ -604,7 +604,7 @@ function linkerFlags(project, product, input, outputs) { args.push("TO", '"' + FileInfo.toWindowsSeparators(outputs.application[0].filePath) + '"'); // Map file generation flag. - if (!product.cpp.generateMapFile) + if (!product.cpp.generateLinkerMapFile) args.push("NOMAP"); } else if (architecture === "arm") { // Inputs. @@ -629,7 +629,7 @@ function linkerFlags(project, product, input, outputs) { args.push(debugInformation ? "--debug" : "--no_debug"); // Map file generation flag. - if (product.cpp.generateMapFile) + if (product.cpp.generateLinkerMapFile) args.push("--list", outputs.map_file[0].filePath); // Entry point flag. |