diff options
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 5 | ||||
| -rw-r--r-- | tests/auto/api/testdata/build-properties-source/build-properties-source.qbs | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 792e8ef4c..4e68dc267 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -343,8 +343,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; } } @@ -352,7 +351,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); diff --git a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs index 49f565b29..485bca79d 100644 --- a/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs +++ b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs @@ -8,6 +8,11 @@ Project { Depends { name: 'cpp' } + Properties { + condition: qbs.toolchain.contains("gcc") + cpp.cxxFlags: "-march=native" + } + Group { cpp.defines: ['WORLD="BANANA"'] files : [ "main.cpp" ] |