From 4b513136b1b199fcfaf3c19957ead6e9eba9c35d Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 6 Oct 2020 00:04:57 -0700 Subject: [PATCH] meson: Use more portable compiler option -std. GCC and Clang support --std and -std options but Intel C++ Compiler only supports -std. icpc: command line warning #10159: invalid argument for option '--std' Fixes: 8a05d6ffc65d ("driconf: Make the driver's declarations be structs instead of XML.") Signed-off-by: Vinson Lee Reviewed-by: Eric Anholt Part-of: --- src/util/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/meson.build b/src/util/meson.build index 16e3999db96..a14c0137383 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -229,7 +229,7 @@ files_xxd = files('xxd.py') if with_tests # DRI_CONF macros use designated initializers (required for union # initializaiton), so we need c++2a since gtest forces us to use c++ - if host_machine.system() != 'windows' and cpp.has_argument('--std=c++2a') + if host_machine.system() != 'windows' and cpp.has_argument('-std=c++2a') test('xmlconfig', executable('xmlconfig_test', files('tests/xmlconfig.cpp'),