aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-06-26 20:11:05 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-06-28 17:18:04 +0000
commitdea1145d214a0bc4f082f0588b7272334b6a182a (patch)
treed80c580a20b44d8a9cbe4939c232b66813a1f573 /share
parent3545a25377330fb49f7a4aeacbf0bfe21adf04b2 (diff)
baremetal: Fix {c|cpp}LanguageVersion handling on KEIL ARM Clang toolchain
We need to skip the 'undefined' language version returned from the Cpp.languageVersion() function. Change-Id: I3345c2fbdde8b50c8fb9035ec10ca21e0024e6d3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/keil.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js
index d88f8bed6..b6842c321 100644
--- a/share/qbs/modules/cpp/keil.js
+++ b/share/qbs/modules/cpp/keil.js
@@ -867,14 +867,16 @@ function compilerFlags(project, product, input, outputs, explicitlyDependsOn) {
"gnu90", "gnu99", "gnu11"];
var cLanguageVersion = Cpp.languageVersion(
input.cpp.cLanguageVersion, knownCLanguageValues, "C");
- args.push("-std=" + cLanguageVersion);
+ if (cLanguageVersion)
+ args.push("-std=" + cLanguageVersion);
} else if (tag === "cpp") {
// C++ language version flags.
var knownCppLanguageValues = ["c++98", "c++03", "c++11", "c++14", "c++17",
"gnu++98", "gnu++11", "gnu++14", "gnu++17"];
var cppLanguageVersion = Cpp.languageVersion(
input.cpp.cxxLanguageVersion, knownCppLanguageValues, "C++");
- args.push("-std=" + cppLanguageVersion);
+ if (cppLanguageVersion)
+ args.push("-std=" + cppLanguageVersion);
// Exceptions flags.
var enableExceptions = input.cpp.enableExceptions;