diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-10-09 22:20:56 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-10-10 14:01:56 +0000 |
| commit | 39ddab6b69fb3bbd14c5aa019e31271c65e6f16c (patch) | |
| tree | a220396e7001cf7e3043459ba376502e8f56eea4 /share/qbs/modules/cpp/keil.qbs | |
| parent | 905ee49fabe197bfe4537c1f10df9d7c48f731c2 (diff) | |
baremetal: Fix merging issues from 1.14 to master
Change-Id: Id859d95ddfb776ec534ba0e46d989bb2ba30770a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/keil.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/keil.qbs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/share/qbs/modules/cpp/keil.qbs b/share/qbs/modules/cpp/keil.qbs index 1a1792118..aca00eb99 100644 --- a/share/qbs/modules/cpp/keil.qbs +++ b/share/qbs/modules/cpp/keil.qbs @@ -103,14 +103,7 @@ CppModule { } FileTagger { - condition: qbs.architecture === "mcs51"; - patterns: ["*.a51", "*.A51"] - fileTags: ["asm"] - } - - FileTagger { - condition: qbs.architecture === "arm"; - patterns: ["*.s", ".asm"] + patterns: ["*.s", "*.a51", ".asm"] fileTags: ["asm"] } @@ -127,12 +120,7 @@ CppModule { id: applicationLinker multiplex: true inputs: ["obj", "linkerscript"] - outputFileTags: { - var tags = ["application", "mem_map"]; - if (product.moduleProperty("cpp", "generateLinkerMapFile")) - tags.push("map_file"); - return tags; - } + outputFileTags: ["application", "mem_map"] outputArtifacts: KEIL.applicationLinkerOutputArtifacts(product) prepare: KEIL.prepareLinker.apply(KEIL, arguments) } |