*-symbol-check: use correct `nm` path when cross-compiling

Inspired-by: a similar patch for libdrm by Heiko Becker
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/configure.ac b/configure.ac
index 346c8130352bd096e039effa5d02792a415801ae..d8093597dd04ba40a7355efd9d3b3cf6c696929b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,7 @@ dnl other CC/CXX flags related help
 AC_ARG_VAR([CXX11_CXXFLAGS], [Compiler flag to enable C++11 support (only needed if not
                               enabled by default and different  from -std=c++11)])
 AM_PROG_CC_C_O
+AC_PROG_NM
 AM_PROG_AS
 AX_CHECK_GNU_MAKE
 AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])

diff --git a/meson.build b/meson.build
index 8cf67b81715bc549d72130374eee98f46ac2c61e..6f2615f9d17d0dc255b27e80e9fd05833b82565a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1256,6 +1256,9 @@ endif
 
 pkg = import('pkgconfig')
 
+env_test = environment()
+env_test.set('NM', find_program('nm').path())
+
 subdir('include')
 subdir('bin')
 subdir('src')

diff --git a/src/egl/egl-symbols-check b/src/egl/egl-symbols-check
index ae867d04bca91f22b070928d432fe26a24039edc..460e61a357c7ab6d02c35cb3172a7f9957c195d3 100755 (executable)
--- a/src/egl/egl-symbols-check
+++ b/src/egl/egl-symbols-check
@@ -8,7 +8,7 @@ then
   exit 1
 fi
 
-FUNCS=$(nm -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do
+FUNCS=$($NM -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 eglBindAPI
 eglBindTexImage

diff --git a/src/egl/meson.build b/src/egl/meson.build
index abf6085573761f0f55c4bf429fbc8ae0a4569e10..36cd33ac08b24134a61f902a32370326bb9ba27e 100644 (file)
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -204,6 +204,7 @@ if with_tests
   else
     test('egl-symbols-check',
       find_program('egl-symbols-check'),
+      env : env_test,
       args : libegl
     )
   endif

diff --git a/src/egl/wayland/wayland-egl/meson.build b/src/egl/wayland/wayland-egl/meson.build
index c95d4c1d1f4175ce4754e28e72f8d46853c28b0d..d0a7521da915580a6a7cbf06ca9527ae7fd6552f 100644 (file)
--- a/src/egl/wayland/wayland-egl/meson.build
+++ b/src/egl/wayland/wayland-egl/meson.build
@@ -40,6 +40,7 @@ pkg.generate(
 if with_tests
   test('wayland-egl-symbols-check',
     find_program('wayland-egl-symbols-check'),
+    env : env_test,
     args : libwayland_egl
   )
   test(

diff --git a/src/egl/wayland/wayland-egl/wayland-egl-symbols-check b/src/egl/wayland/wayland-egl/wayland-egl-symbols-check
index 04b2dbf1d3767703172077909f634035a6675c44..a5fab775824e78b3bf327eafe1e0118c24a6819e 100755 (executable)
--- a/src/egl/wayland/wayland-egl/wayland-egl-symbols-check
+++ b/src/egl/wayland/wayland-egl/wayland-egl-symbols-check
@@ -8,7 +8,7 @@ then
   exit 1
 fi
 
-FUNCS=$(nm -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do
+FUNCS=$($NM -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 wl_egl_window_resize
 wl_egl_window_create

diff --git a/src/gbm/gbm-symbols-check b/src/gbm/gbm-symbols-check
index cf57a08d5728cfff480c05033e0f5b9fc72920d8..5adeadaed07811010d9b94ebe3c3112f6c89d076 100755 (executable)
--- a/src/gbm/gbm-symbols-check
+++ b/src/gbm/gbm-symbols-check
@@ -8,8 +8,7 @@ then
   exit 1
 fi
 
-
-FUNCS=$(nm -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do
+FUNCS=$($NM -D --defined-only $LIB | grep -o "T .*" | cut -c 3- | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 gbm_device_get_fd
 gbm_device_get_backend_name

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index 2f5d1c6ddd7cdd4f666fbd2041f1be9130507cf1..13fa3a1f84c36b1af1a07612af2bb22e54194e0d 100644 (file)
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -74,6 +74,7 @@ if with_tests
   test(
     'gbm-symbols-check',
     find_program('gbm-symbols-check'),
+    env : env_test,
     args : libgbm
   )
 endif

diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
index b9ae5efafd8f4bd863b1584af1d5470265ddc0cc..11b4923dea280be2f8498ae9a600fbb37206efce 100755 (executable)
--- a/src/mapi/es1api/ABI-check
+++ b/src/mapi/es1api/ABI-check
@@ -26,7 +26,7 @@ then
   exit 1
 fi
 
-FUNCS=$(nm -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read func; do
+FUNCS=$($NM -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 glActiveTexture
 glAlphaFunc

diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index 38a5747e9a074027003340e4a454a8e5e13a8715..657dc2d9eff35ed04ede1d2c67a65c79e159e9d8 100644 (file)
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -55,6 +55,7 @@ if with_tests
   test(
     'es1-ABI-check',
     find_program('ABI-check'),
+    env : env_test,
     args : libglesv1_cm
   )
 endif

diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
index 7bc78480f767d4650bf33264d4bc3fb82c68c189..a04b03d7d6006ad7f2cc5e48dcc36c2e7cdd5614 100755 (executable)
--- a/src/mapi/es2api/ABI-check
+++ b/src/mapi/es2api/ABI-check
@@ -23,7 +23,7 @@ then
   exit 1
 fi
 
-FUNCS=$(nm -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read func; do
+FUNCS=$($NM -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read func; do
 ( grep -q "^$func$" || echo $func )  <<EOF
 glActiveShaderProgram
 glActiveTexture

diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 9f4770a7386a87189737d392fbf1e66268ddc04f..da5198ed6e898a927b7874ae02e63a61f95d5191 100644 (file)
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -55,6 +55,7 @@ if with_tests
   test(
     'es2-ABI-check',
     find_program('ABI-check'),
+    env : env_test,
     args : libgles2
   )
 endif