1 files changed, 8 insertions, 18 deletions
diff --git a/share/qbs/modules/cpp/sdcc.qbs b/share/qbs/modules/cpp/sdcc.qbs
index a0d795b40..119a0ba92 100644
--- a/share/qbs/modules/cpp/sdcc.qbs
+++ b/share/qbs/modules/cpp/sdcc.qbs
@@ -80,26 +80,16 @@ CppModule {
 
     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"
@@ -124,7 +114,7 @@ CppModule {
                       + input.fileName + input.cpp.objectSuffix
         }
 
-        prepare: SDCC.prepareAssembler.apply(SDCC, arguments);
+        prepare: SDCC.prepareAssembler.apply(SDCC, arguments)
     }
 
     FileTagger {
@@ -150,7 +140,7 @@ CppModule {
                       + input.fileName + input.cpp.objectSuffix
         }
 
-        prepare: SDCC.prepareCompiler.apply(SDCC, arguments);
+        prepare: SDCC.prepareCompiler.apply(SDCC, arguments)
     }
 
     Rule {
@@ -184,7 +174,7 @@ CppModule {
             return artifacts;
         }
 
-        prepare:SDCC.prepareLinker.apply(SDCC, arguments);
+        prepare: SDCC.prepareLinker.apply(SDCC, arguments)
     }
 
     Rule {
@@ -200,6 +190,6 @@ CppModule {
                             PathTools.staticLibraryFilePath(product))
         }
 
-        prepare: SDCC.prepareArchiver.apply(SDCC, arguments);
+        prepare: SDCC.prepareArchiver.apply(SDCC, arguments)
     }
 }