diff options
| author | Eric Engestrom <[email protected]> | 2018-02-23 17:02:08 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2018-02-26 13:50:59 +0000 |
| commit | 11d45304fd20bbdf07222830e76d3f9977e803b4 (patch) | |
| tree | 8e5e9b3f516c5bcdd222677f1b8ccdd6b8b61052 /src/egl | |
| parent | ef308d40070014b92aaf07a228edc73bd2e85570 (diff) | |
*-symbol-check: use correct `nm` path when cross-compiling
Inspired-by: a similar patch for libdrm by Heiko Becker
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/egl')
| -rwxr-xr-x | src/egl/egl-symbols-check | 2 | ||||
| -rw-r--r-- | src/egl/meson.build | 1 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-egl/meson.build | 1 | ||||
| -rwxr-xr-x | src/egl/wayland/wayland-egl/wayland-egl-symbols-check | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/egl/egl-symbols-check b/src/egl/egl-symbols-check index ae867d04bca..460e61a357c 100755 --- 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 abf60855737..36cd33ac08b 100644 --- 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 c95d4c1d1f4..d0a7521da91 100644 --- 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 04b2dbf1d37..a5fab775824 100755 --- 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 |