1 files changed, 27 insertions, 11 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js
index 416de7ee2..47158a209 100644
--- a/share/qbs/modules/cpp/iar.js
+++ b/share/qbs/modules/cpp/iar.js
@@ -612,6 +612,20 @@ function collectLibraryDependencies(product) {
     return result;
 }
 
+function compilerOutputTags(needsListingFiles) {
+    var tags = ["obj"];
+    if (needsListingFiles)
+        tags.push("lst");
+    return tags;
+}
+
+function applicationLinkerOutputTags(needsLinkerMapFile) {
+    var tags = ["application"];
+    if (needsLinkerMapFile)
+        tags.push("mem_map");
+    return tags;
+}
+
 function compilerOutputArtifacts(input, isCompilerArtifacts) {
     var artifacts = [];
     artifacts.push({
@@ -636,19 +650,21 @@ function compilerOutputArtifacts(input, isCompilerArtifacts) {
 }
 
 function applicationLinkerOutputArtifacts(product) {
-    var app = {
+    var artifacts = [{
         fileTags: ["application"],
         filePath: FileInfo.joinPaths(
-                      product.destinationDirectory,
-                      PathTools.applicationFilePath(product))
-    };
-    var mem_map = {
-        fileTags: ["mem_map"],
-        filePath: FileInfo.joinPaths(
-                      product.destinationDirectory,
-                      product.targetName + product.cpp.linkerMapSuffix)
-    };
-    return [app, mem_map]
+            product.destinationDirectory,
+            PathTools.applicationFilePath(product))
+    }];
+    if (product.cpp.generateLinkerMapFile) {
+        artifacts.push({
+            fileTags: ["mem_map"],
+            filePath: FileInfo.joinPaths(
+                product.destinationDirectory,
+                product.targetName + product.cpp.linkerMapSuffix)
+        });
+    }
+    return artifacts;
 }
 
 function staticLibraryLinkerOutputArtifacts(product) {