1 files changed, 6 insertions, 22 deletions
diff --git a/share/qbs/modules/cpp/sdcc.qbs b/share/qbs/modules/cpp/sdcc.qbs
index 7b65ec609..bf44b6f8e 100644
--- a/share/qbs/modules/cpp/sdcc.qbs
+++ b/share/qbs/modules/cpp/sdcc.qbs
@@ -66,38 +66,22 @@ CppModule {
 
     property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : ""
 
-    property bool generateMapFile: true
-    PropertyOptions {
-        name: "generateMapFile"
-        description: "produce a linker list file (enabled by default)"
-    }
-
     /* Work-around for QtCreator which expects these properties to exist. */
     property string cCompilerName: compilerName
     property string cxxCompilerName: compilerName
 
     property string linkerMode: "automatic"
 
-    compilerName: "sdcc" + compilerExtension
+    compilerName: SDCC.compilerName(qbs) + compilerExtension
     compilerPath: FileInfo.joinPaths(toolchainInstallPath, compilerName)
 
-    assemblerName: {
-        switch (qbs.architecture) {
-        case "mcs51":
-            return "sdas8051" + compilerExtension;
-        }
-    }
+    assemblerName: SDCC.assemblerName(qbs) + compilerExtension
     assemblerPath: FileInfo.joinPaths(toolchainInstallPath, assemblerName)
 
-    linkerName: {
-        switch (qbs.architecture) {
-        case "mcs51":
-            return "sdld" + compilerExtension;
-        }
-    }
+    linkerName: SDCC.linkerName(qbs) + compilerExtension
     linkerPath: FileInfo.joinPaths(toolchainInstallPath, linkerName)
 
-    property string archiverName: "sdcclib" + compilerExtension
+    property string archiverName: SDCC.archiverName(qbs) + compilerExtension
     property string archiverPath: FileInfo.joinPaths(toolchainInstallPath, archiverName)
 
     runtimeLibrary: "static"
@@ -117,7 +101,7 @@ CppModule {
         inputs: ["asm"]
         outputFileTags: ["obj", "asm_adb", "asm_lst", "asm_src", "asm_sym", "rst_data"]
         outputArtifacts: SDCC.compilerOutputArtifacts(input)
-        prepare: SDCC.prepareAssembler.apply(SDCC, arguments);
+        prepare: SDCC.prepareAssembler.apply(SDCC, arguments)
     }
 
     FileTagger {
@@ -148,7 +132,7 @@ CppModule {
         inputsFromDependencies: ["staticlibrary"]
         outputFileTags: ["application", "lk_cmd", "mem_summary", "mem_map"]
         outputArtifacts: SDCC.applicationLinkerOutputArtifacts(product)
-        prepare:SDCC.prepareLinker.apply(SDCC, arguments)
+        prepare: SDCC.prepareLinker.apply(SDCC, arguments)
     }
 
     Rule {