diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-06-19 23:03:39 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-06-22 14:34:44 +0000 |
| commit | d5c901505667dce23621add4280277f288cd168f (patch) | |
| tree | dd603a9dba3966c5fe2bd94ca99e82eba3703322 | |
| parent | daeee1c8fbb45c72aadd454db704d092b8579c81 (diff) | |
baremetal: Fix linker name detection for ARM using IAR toolchain
This commit ab0abfc introduced a regression in the detection of
a linker name for the ARM architecture.
A problem is that now the ARM architecture has a detailed name,
e.g. "armv7", "armv6", against the previous "arm" name. In this
case the following code:
"ilink" + architecture
returns a wrong linker name, e.g. "ilinkarmv7" instead of "ilinkarm".
So, we need to check on ARM architecture and then return a valid
linker name directly.
Change-Id: I4f44cdc9875f00676bc36cfa4fc36b36b92a8190
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/iar.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js index f67b6297b..5ed85ead4 100644 --- a/share/qbs/modules/cpp/iar.js +++ b/share/qbs/modules/cpp/iar.js @@ -188,7 +188,7 @@ function linkerName(qbs) { if (supportXLinker(architecture)) return "xlink"; else if (supportILinker(architecture)) - return "ilink" + architecture; + return architecture.startsWith("arm") ? "ilinkarm" : ("ilink" + architecture); throw "Unable to deduce linker name for unsupported architecture: '" + architecture + "'"; } |