Merge 1.12 into master

Change-Id: I0ce6c28f9117f945c9fec0654bd06daf3d13ace0

1 files changed, 2 insertions, 3 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 871eeeefa..423d964d5 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -342,8 +342,7 @@ CppModule {
         var validateFlagsFunction = function (value) {
             if (value) {
                 for (var i = 0; i < value.length; ++i) {
-                    if (["-target", "-triple", "-arch"].contains(value[i])
-                            || value[i].startsWith("-march="))
+                    if (["-target", "-triple", "-arch"].contains(value[i]))
                         return false;
                 }
             }
@@ -351,7 +350,7 @@ CppModule {
         }
 
         var validator = new ModUtils.PropertyValidator("cpp");
-        var msg = "'-target', '-triple', '-arch' and '-march' cannot appear in flags; set qbs.architecture instead";
+        var msg = "'-target', '-triple' and '-arch' cannot appear in flags; set qbs.architecture instead";
         validator.addCustomValidator("assemblerFlags", assemblerFlags, validateFlagsFunction, msg);
         validator.addCustomValidator("cppFlags", cppFlags, validateFlagsFunction, msg);
         validator.addCustomValidator("cFlags", cFlags, validateFlagsFunction, msg);