diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-08-13 12:50:45 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-08-13 12:06:03 +0000 |
| commit | d03135c9509821270c541fe0725d7365c7a19d55 (patch) | |
| tree | 5ab1278b4cd583350f0806d9f4ea281202c48f00 /share | |
| parent | a30d2724e22214d21ccfa2b52ed99972e925b2ba (diff) | |
baremetal: Fix detection of ARM architecture details for KEIL armclang
The '__ARM_ARCH_PROFILE' macro contains the desired ARM profile
letter, which appends to the resulting ARM architecture name.
But a problem is that this letter wrapped in quotes, e.g. 'M'.
In this case the constructed architecture also has this quotes,
e.g. armv6'm', that's wrong.
We need to remove all quotes from the found letter and then
append this letter to the resulting string.
Change-Id: Idea61082ebb584151ddcb1acc9eba62a516ea170
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/keil.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js index 672e26672..fcea3c4b3 100644 --- a/share/qbs/modules/cpp/keil.js +++ b/share/qbs/modules/cpp/keil.js @@ -213,6 +213,7 @@ function guessArmCCArchitecture(targetArchArm, targetArchThumb) { } function guessArmClangArchitecture(targetArchArm, targetArchProfile) { + targetArchProfile = targetArchProfile.replace(/'/g, ""); var arch = "arm"; if (targetArchArm !== "" && targetArchProfile !== "") arch += "v" + targetArchArm + targetArchProfile.toLowerCase(); |