Check for nm and gnm as gnu nm, use a $(NM) variable instead of hard-coding the binary name of nm

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@38605 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2015-06-09 08:39:35 +00:00
parent 626f795310
commit b31da7bdb6
5 changed files with 2804 additions and 3353 deletions

View file

@ -1,3 +1,13 @@
2015-06-09 Riccardo Mottola <rm@gnu.org>
* config.make.in
* configure.ac
* target.make
Check for nm and gnm as gnu nm, use a $(NM) variable instead of hard-coding the binary name of nm
* configure
Regerenated
2015-05-15 Richard Frith-Macdonald <rfm@gnu.org>
* Documentation/news.texi:

View file

@ -164,6 +164,7 @@ INSTALL_DATA = @INSTALL_DATA@
TAR = @TAR@
MAKE = @GNUMAKE@
MKDIRS = $(GNUSTEP_MAKEFILES)/mkinstalldirs
NM = @NM@
LATEX2HTML = @LATEX2HTML@

6135
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -260,6 +260,9 @@ fi
AC_PROG_LN_S([])
AC_CHECK_PROGS(NM, gnm, nm)
AC_CHECK_PROGS(TAR, gnutar gtar, tar)
AC_ARG_WITH(tar,[
--with-tar

View file

@ -151,7 +151,7 @@ endif
# with XXXX, and prints the result. '-n' disables automatic printing
# for portability, so we are sure we only print what we want on all
# platforms.
EXTRACT_CLASS_NAMES_COMMAND = nm -Pg $$object_file | sed -n -e '/^__objc_class_name_[A-Za-z0-9_.]* [^U]/ {s/^__objc_class_name_\([A-Za-z0-9_.]*\) [^U].*/\1/p;}'
EXTRACT_CLASS_NAMES_COMMAND = $(NM) -Pg $$object_file | sed -n -e '/^__objc_class_name_[A-Za-z0-9_.]* [^U]/ {s/^__objc_class_name_\([A-Za-z0-9_.]*\) [^U].*/\1/p;}'
#
# This is the generic version - if the target is not in the following list,
@ -279,7 +279,7 @@ HAVE_SHARED_LIBS = yes
SHARED_LIBEXT = .dylib
# The output of nm is slightly different on Darwin, it doesn't support -P
EXTRACT_CLASS_NAMES_COMMAND = nm -g $$object_file | sed -n -e '/[^U] ___objc_class_name_/ {s/[0-9a-f]* [^U] ___objc_class_name_//p;}'
EXTRACT_CLASS_NAMES_COMMAND = $(NM) -g $$object_file | sed -n -e '/[^U] ___objc_class_name_/ {s/[0-9a-f]* [^U] ___objc_class_name_//p;}'
ifeq ($(FOUNDATION_LIB), apple)
ifneq ($(arch),)
@ -781,7 +781,7 @@ ADDITIONAL_LDFLAGS += -Wl,-E
STATIC_LDFLAGS += -static
# nm on OpenBSD is rather like on Darwin
EXTRACT_CLASS_NAMES_COMMAND = nm -g $$object_file | sed -n -e '/[^U] __objc_class_name_/ {s/[0-9a-f]* [^U] __objc_class_name_//p;}'
EXTRACT_CLASS_NAMES_COMMAND = $(NM) -g $$object_file | sed -n -e '/[^U] __objc_class_name_/ {s/[0-9a-f]* [^U] __objc_class_name_//p;}'
endif
#
# end OpenBSD 3.x
@ -930,7 +930,7 @@ ADDITIONAL_FLAGS += -fno-omit-frame-pointer
# On Mingw32, it looks like the class name symbols start with '___' rather
# than '__'
EXTRACT_CLASS_NAMES_COMMAND = nm -Pg $$object_file | sed -n -e '/^___objc_class_name_[A-Za-z0-9_.]* [^U]/ {s/^___objc_class_name_\([A-Za-z0-9_.]*\) [^U].*/\1/p;}'
EXTRACT_CLASS_NAMES_COMMAND = $(NM) -Pg $$object_file | sed -n -e '/^___objc_class_name_[A-Za-z0-9_.]* [^U]/ {s/^___objc_class_name_\([A-Za-z0-9_.]*\) [^U].*/\1/p;}'
endif