diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-06-08 18:02:23 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-06-13 22:32:03 +0000 |
| commit | aa859910f956161e1a4bc8b9b5012c2335bf5eca (patch) | |
| tree | fa45d98e4c7b5ad8d8b1256b0b0117c4f4d56a77 /share/qbs/modules/cpp/keil.qbs | |
| parent | f0a39bab91c7ea823dcfb645c0b7f934d3f4fcdf (diff) | |
baremetal: Introduce new toolchainDetails property
.. to reduce the number of if/else conditions and to simplify the code.
Change-Id: Id4e6574b719986d3fc7f8b27106a60b00cbd67ea
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/cpp/keil.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/keil.qbs | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/share/qbs/modules/cpp/keil.qbs b/share/qbs/modules/cpp/keil.qbs index 7aab9ba3b..b9d3f8264 100644 --- a/share/qbs/modules/cpp/keil.qbs +++ b/share/qbs/modules/cpp/keil.qbs @@ -70,29 +70,29 @@ CppModule { property string cCompilerName: compilerName property string cxxCompilerName: compilerName - compilerName: KEIL.compilerName(qbs) + compilerExtension + compilerName: toolchainDetails.compilerName + compilerExtension compilerPath: FileInfo.joinPaths(toolchainInstallPath, compilerName) - assemblerName: KEIL.assemblerName(qbs) + compilerExtension + assemblerName: toolchainDetails.assemblerName + compilerExtension assemblerPath: FileInfo.joinPaths(toolchainInstallPath, assemblerName) - linkerName: KEIL.linkerName(qbs) + compilerExtension + linkerName: toolchainDetails.linkerName + compilerExtension linkerPath: FileInfo.joinPaths(toolchainInstallPath, linkerName) - property string archiverName: KEIL.archiverName(qbs) + compilerExtension + property string archiverName: toolchainDetails.archiverName + compilerExtension property string archiverPath: FileInfo.joinPaths(toolchainInstallPath, archiverName) - property string disassemblerName: KEIL.disassemblerName(qbs) + compilerExtension + property string disassemblerName: toolchainDetails.disassemblerName + compilerExtension property string disassemblerPath: FileInfo.joinPaths(toolchainInstallPath, disassemblerName) runtimeLibrary: "static" - staticLibrarySuffix: KEIL.staticLibrarySuffix(qbs) - executableSuffix: KEIL.executableSuffix(qbs) - objectSuffix: KEIL.objectSuffix(qbs) - linkerMapSuffix: KEIL.linkerMapSuffix(qbs) + staticLibrarySuffix: ".lib" + executableSuffix: toolchainDetails.executableSuffix + objectSuffix: toolchainDetails.objectSuffix + linkerMapSuffix: toolchainDetails.linkerMapSuffix - imageFormat: KEIL.imageFormat(qbs) + imageFormat: toolchainDetails.imageFormat enableExceptions: false enableRtti: false @@ -105,6 +105,8 @@ CppModule { libraryPathFlag: "--userlibpath=" linkerScriptFlag: "--scatter" + toolchainDetails: KEIL.toolchainDetails(qbs) + knownArchitectures: ["arm", "c166", "mcs251", "mcs51"] Rule { |