Mesa (master): meson: move the generic symbols check arguments to a common variable
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 5 22:12:32 UTC 2019
Module: Mesa
Branch: master
Commit: 2f652e0b3691e94d6a81e37985741d35561b2312
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f652e0b3691e94d6a81e37985741d35561b2312
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Tue Oct 29 21:32:05 2019 +0000
meson: move the generic symbols check arguments to a common variable
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviwed-by: Dylan Baker <dylan at pnwbakers>
---
meson.build | 1 +
src/amd/vulkan/meson.build | 2 +-
src/egl/meson.build | 2 +-
src/freedreno/vulkan/meson.build | 2 +-
src/gbm/meson.build | 2 +-
src/intel/vulkan/meson.build | 2 +-
src/mapi/es1api/meson.build | 2 +-
src/mapi/es2api/meson.build | 2 +-
src/mapi/shared-glapi/meson.build | 2 +-
9 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index dcc4827fed7..020f725116f 100644
--- 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 732659fb644..54d2f319f0b 100644
--- 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 e691f509067..12d74ec37fa 100644
--- 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 d7f91d24358..70efd26008b 100644
--- 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 c4b1c25f9d1..ed4310d6598 100644
--- 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 a829361e926..c21d7bd2507 100644
--- 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 b2dcd5413ad..711048421b8 100644
--- 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 119e8d36a75..ac79aa66f89 100644
--- 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 27ae6bcc158..5b9db0c081a 100644
--- 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'],
)
More information about the mesa-commit
mailing list