meson: move the generic symbols check arguments to a common variable

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviwed-by: Dylan Baker <dylan@pnwbakers>

diff --git a/meson.build b/meson.build
index dcc4827fed7e18d67a4d53a453f6d4cb71ce955e..020f725116fbfe57d7047480d0cf121538392a81 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1682,6 +1682,7 @@ pkg = import('pkgconfig')
 
 prog_nm = find_program('nm', required : false)
 with_symbols_check = prog_nm.found() and with_tests
+symbols_check_args = ['--nm', prog_nm.path()]
 
 # This quirk needs to be applied to sources with functions defined in assembly
 # as GCC LTO drops them. See: https://bugs.freedesktop.org/show_bug.cgi?id=109391

diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 732659fb6446011e20fc76a6a80efad5ab79ed01..54d2f319f0bf7a3c6aad58b3c170c515ab993d3f 100644 (file)
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -173,7 +173,7 @@ if with_symbols_check
     args : [
       '--lib', libvulkan_radeon,
       '--symbols-file', vulkan_icd_symbols,
-      '--nm', prog_nm.path(),
+      symbols_check_args,
     ],
     suite : ['amd'],
   )

diff --git a/src/egl/meson.build b/src/egl/meson.build
index e691f509067239306b6b94c41a78ecc2215f5b91..12d74ec37faacbb4c53e4ddcb9c0d21d28bd4551 100644 (file)
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -197,7 +197,7 @@ if with_symbols_check
     args : [
       '--lib', libegl,
       '--symbols-file', egl_symbols,
-      '--nm', prog_nm.path(),
+      symbols_check_args,
     ],
     suite : ['egl'],
   )

diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index d7f91d24358dc9c7693ca2ede12c80e98e6b1b4d..70efd26008bce3e8de3d7302ab43bee433c65db1 100644 (file)
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -126,7 +126,7 @@ if with_symbols_check
     args : [
       '--lib', libvulkan_freedreno,
       '--symbols-file', vulkan_icd_symbols,
-      '--nm', prog_nm.path(),
+      symbols_check_args,
     ],
     suite : ['freedreno'],
   )

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index c4b1c25f9d161aee3d24dfa1f88f75c2a65c3f61..ed4310d6598662804a79e6c847f8a67166e7c490 100644 (file)
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -73,7 +73,7 @@ if with_symbols_check
     args : [
       '--lib', libgbm,
       '--symbols-file', files('gbm-symbols.txt'),
-      '--nm', prog_nm.path(),
+      symbols_check_args,
     ],
     suite : ['gbm'],
   )

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index a829361e926829e953103b3fdcaba7964c4f00ff..c21d7bd25074bc7305ca3bcf41ff8ac8c658d657 100644 (file)
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -214,7 +214,7 @@ if with_symbols_check
     args : [
       '--lib', libvulkan_intel,
       '--symbols-file', vulkan_icd_symbols,
-      '--nm', prog_nm.path(),
+      symbols_check_args,
     ],
     suite : ['intel'],
   )

diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index b2dcd5413ad69a6e82b75ee4156af4604cf8c0e6..711048421b80288664b96839e7fbc117582e5623 100644 (file)
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -69,7 +69,7 @@ if with_symbols_check
     args : [
       '--lib', libglesv1_cm,
       '--symbols-file', files('gles1-symbols.txt'),
-      '--nm', prog_nm.path(),
+      symbols_check_args,
     ],
     suite : ['mapi'],
   )

diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 119e8d36a75e56eef908f9da6e510c257170133c..ac79aa66f89aafe64cc75d8a4e52d8e57f08c0d1 100644 (file)
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -69,7 +69,7 @@ if with_symbols_check
     args : [
       '--lib', libgles2,
       '--symbols-file', files('gles2-symbols.txt'),
-      '--nm', prog_nm.path(),
+      symbols_check_args,
     ],
     suite : ['mapi'],
   )

diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
index 27ae6bcc158ae5613a68684bc4a407b3b829397a..5b9db0c081a90acf6f5d6740492c23ca6899141b 100644 (file)
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -81,7 +81,7 @@ if with_any_opengl and with_tests
       args : [
         '--lib', libglapi,
         '--symbols-file', files('glapi-symbols.txt'),
-        '--nm', prog_nm.path(),
+        symbols_check_args,
       ],
       suite : ['mapi'],
     )