New upstream version 1.32.12 upstream/1.32.12

1 files changed, 17 insertions, 14 deletions

diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh
index f7fd3bab..21ba369a 100755
--- a/tools/create-exports-NetworkManager.sh
+++ b/tools/create-exports-NetworkManager.sh
@@ -35,15 +35,18 @@ _sort() {
 }
 
 call_nm() {
-    "${NM:-nm}" "$1" |
-        sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p'
+    if [ -n "$from_meson" ]; then
+        "${NM:-nm}" "$1" |
+            sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p'
+    else
+        libtool=(${LIBTOOL:-libtool})
+        ${libtool[@]} --mode=execute "${NM:-nm}" "$1" |
+            sed -n 's/.* \([^ ]\) \([^ ]*\)$/\1 \2/p'
+    fi
 }
 
 get_symbols_nm () {
-    base=./src/core/.libs/NetworkManager-all-sym
-    if ! test -f "$base"; then
-        base=./src/core/NetworkManager-all-sym
-    fi
+    base=./src/core/NetworkManager-all-sym
     call_nm "$base" |
         sed -n 's/^[tTDGRBS] //p' |
         _sort
@@ -85,6 +88,14 @@ do_update() {
     do_generate > ./src/core/NetworkManager.ver
 }
 
+if [ -f "build.ninja" ]; then
+    from_meson=1
+    libs=
+else
+    from_meson=
+    libs=.libs/
+fi
+
 SYMBOLS_MISSING="$(get_symbols_missing | pretty)"
 SYMBOLS_EXPLICIT="$(get_symbols_explicit | pretty)"
 
@@ -102,14 +113,6 @@ local:
 EOF
 }
 
-if [ -f "build.ninja" ]; then
-    from_meson=1
-    libs=
-else
-    from_meson=
-    libs=.libs/
-fi
-
 test -f ./src/core/${libs}libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree"
 
 case "$1" in