From 4052142de7a566db65fb0153b55e085c0df87e3a Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 29 Jan 2019 11:25:30 -0800 Subject: [PATCH] meson: remove -std=c++11 from intel/tools for meson all C++ code is already compiled as C++11, so it's unnecessary. It's also the wrong way to do this, if we really needed this the correct way is to set: ```meson executable( ... override_options : ['cpp_std=c++11'], ) ``` Which ensures not only that the correct syntax for the current compiler is used, but also that meson doesn't create arguments like `-std=c++14 ... -std=c++11` Reviewed-by: Caio Marcelo de Oliveira Filho Reviewed-by: Eric Engestrom --- src/intel/tools/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index 02ebb685531..2ef49ddc17c 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -123,7 +123,7 @@ if with_tools.contains('intel-ui') include_directories : [inc_common, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util, libaub], c_args : [c_vis_args, no_override_init_args], - cpp_args : ['-fpermissive', '-std=c++11', '-Wno-parentheses', '-Wno-class-memaccess'], + cpp_args : ['-fpermissive', '-Wno-parentheses', '-Wno-class-memaccess'], install : true ) endif -- 2.30.2