summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2018-02-23 17:02:08 +0000
committerEric Engestrom <[email protected]>2018-02-26 13:50:59 +0000
commit11d45304fd20bbdf07222830e76d3f9977e803b4 (patch)
tree8e5e9b3f516c5bcdd222677f1b8ccdd6b8b61052 /src/mapi
parentef308d40070014b92aaf07a228edc73bd2e85570 (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/mapi')
-rwxr-xr-xsrc/mapi/es1api/ABI-check2
-rw-r--r--src/mapi/es1api/meson.build1
-rwxr-xr-xsrc/mapi/es2api/ABI-check2
-rw-r--r--src/mapi/es2api/meson.build1
4 files changed, 4 insertions, 2 deletions
diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
index b9ae5efafd8..11b4923dea2 100755
--- 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 38a5747e9a0..657dc2d9eff 100644
--- 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 7bc78480f76..a04b03d7d60 100755
--- 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 9f4770a7386..da5198ed6e8 100644
--- 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