changeset 37546:a8352f0b7854

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.
author Pádraig Brady <P@draigBrady.com>
date Thu, 08 Jan 2015 12:18:54 +0000
parents 59d183c6c526
children 2d36cdcb1d2f
files ChangeLog top/maint.mk
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jan 07 14:36:52 2015 +0900
+++ b/ChangeLog	Thu Jan 08 12:18:54 2015 +0000
@@ -1,3 +1,11 @@
+2015-01-08  Pádraig Brady  <P@draigBrady.com>
+
+	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  <komh@chollian.net>
 
 	localcharset: improve charset detection on OS/2
--- a/top/maint.mk	Wed Jan 07 14:36:52 2015 +0900
+++ b/top/maint.mk	Thu Jan 08 12:18:54 2015 +0000
@@ -1648,14 +1648,14 @@
 	  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; } || :