Mesa (main): meson: Using get_argument_syntax as the `--compiler_id` option for gen_vs_module_defs.py

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1173c0f33ac22955705192e489fb82759c152656
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1173c0f33ac22955705192e489fb82759c152656

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Fri Apr 22 01:09:19 2022 +0800

meson: Using get_argument_syntax as the `--compiler_id` option for gen_vs_module_defs.py

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17065>

---

 src/egl/meson.build                       | 2 +-
 src/gallium/targets/d3d10sw/meson.build   | 2 +-
 src/gallium/targets/libgl-gdi/meson.build | 2 +-
 src/gallium/targets/osmesa/meson.build    | 2 +-
 src/gallium/targets/wgl/meson.build       | 2 +-
 src/mapi/es1api/meson.build               | 2 +-
 src/mapi/es2api/meson.build               | 2 +-
 src/vulkan/meson.build                    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 53044297322..be55ac7ab7f 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -183,7 +183,7 @@ egl_def = custom_target(
   output : 'egl.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 libegl = shared_library(
diff --git a/src/gallium/targets/d3d10sw/meson.build b/src/gallium/targets/d3d10sw/meson.build
index 8b90c561152..26d175e3828 100644
--- a/src/gallium/targets/d3d10sw/meson.build
+++ b/src/gallium/targets/d3d10sw/meson.build
@@ -25,7 +25,7 @@ d3d10_sw_def = custom_target(
   output : 'd3d10_sw.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 libd3d10sw = shared_library(
diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
index b333eae0f34..1edb4a1ff59 100644
--- a/src/gallium/targets/libgl-gdi/meson.build
+++ b/src/gallium/targets/libgl-gdi/meson.build
@@ -27,7 +27,7 @@ opengl32_def = custom_target(
   output : 'opengl32.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 libopengl32 = shared_library(
diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
index 97a9fd954ac..b9ca388fe5e 100644
--- a/src/gallium/targets/osmesa/meson.build
+++ b/src/gallium/targets/osmesa/meson.build
@@ -38,7 +38,7 @@ osmesa_def = custom_target(
   output : 'osmesa.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 libosmesa = shared_library(
diff --git a/src/gallium/targets/wgl/meson.build b/src/gallium/targets/wgl/meson.build
index ace7c33eb94..2999ee5492e 100644
--- a/src/gallium/targets/wgl/meson.build
+++ b/src/gallium/targets/wgl/meson.build
@@ -27,7 +27,7 @@ wgl_def = custom_target(
   output : 'gallium_wgl.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 libgallium_wgl = shared_library(
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index 7910d32729d..733002339a4 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -38,7 +38,7 @@ gles1_def = custom_target(
   output : 'gles1.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 libglesv1_cm = shared_library(
diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 65a4803ff1d..d8f54eb64f4 100644
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -38,7 +38,7 @@ gles2_def = custom_target(
   output : 'gles2.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 libgles2 = shared_library(
diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
index e7fe86eec7c..1e9ab82ce57 100644
--- a/src/vulkan/meson.build
+++ b/src/vulkan/meson.build
@@ -32,7 +32,7 @@ vulkan_api_def = custom_target(
   output : 'vulkan_api.def',
   command : [prog_python, gen_vs_module_defs_py,
              '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
+             '--compiler_id', cc.get_argument_syntax(), '--cpu_family', host_machine.cpu_family()]
 )
 
 if with_platform_x11