Mesa (staging/18.1): nir/meson: fix c vs cpp args for nir test

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Aug 2 18:12:17 UTC 2018


Module: Mesa
Branch: staging/18.1
Commit: c1e67f0b8eeae416278eba5cdc95b9bb2ff11977
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1e67f0b8eeae416278eba5cdc95b9bb2ff11977

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue May 22 15:34:38 2018 -0700

nir/meson: fix c vs cpp args for nir test

Fixes: d1992255bb29054fa51763376d125183a9f602f3
       ("meson: Add build Intel "anv" vulkan driver")
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 34998aae18b1435d6af70c64eaf50a77e7410058)

---

 src/compiler/nir/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index b28a565d0c..6b84deb7db 100644
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -231,7 +231,7 @@ if with_tests
     executable(
       'nir_control_flow_test',
       files('tests/control_flow_tests.cpp'),
-      c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
+      cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
       include_directories : [inc_common],
       dependencies : [dep_thread, idep_gtest, idep_nir],
       link_with : libmesa_util,




More information about the mesa-commit mailing list