From d5e367c52d465a36650d0f4e2d370d1719750ab1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?=
Date: Thu, 8 Jan 2015 12:18:54 +0000
Subject: [PATCH] maint.mk: fix compatibility with OS X nm
* top/maint.mk (_gl_tight_scope): Use the -g option to
show exported items rather than the -e option which is
ignored on all platforms except OS X where it gives an error.
Reported by Assaf Gordon.
---
ChangeLog | 8 ++++++++
top/maint.mk | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 56b75de844..bf3216f02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-08 Pádraig Brady
+
+ maint.mk: fix compatibility with OS X nm
+ * top/maint.mk (_gl_tight_scope): Use the -g option to
+ show exported items rather than the -e option which is
+ ignored on all platforms except OS X where it gives an error.
+ Reported by Assaf Gordon.
+
2015-01-07 KO Myung-Hun
localcharset: improve charset detection on OS/2
diff --git a/top/maint.mk b/top/maint.mk
index d21931f1bb..b6ec1b5e16 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1648,14 +1648,14 @@ _gl_tight_scope: $(bin_PROGRAMS)
perl -lne \
'$(_gl_TS_function_match) and print "^$$1\$$"' $$hdr; \
) | sort -u > $$t; \
- nm -e $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
+ nm -g $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
&& { echo the above functions should have static scope >&2; \
exit 1; } || : ; \
( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars); \
perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' \
$$hdr $(_gl_TS_other_headers) \
) | sort -u > $$t; \
- nm -e $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \
+ nm -g $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \
| sort -u | grep -Ev -f $$t \
&& { echo the above variables should have static scope >&2; \
exit 1; } || :
--
2.39.5