Only run export-check.pl in maintainer mode

Cross compilation environments might not be using the default nm
command.  Rather than try to communicate the correct value to
util/export-check.pl, only run export-check.pl in maintainer mode.

ticket: 8329 (new)

diff --git a/src/config/pre.in b/src/config/pre.in
index b0d9015a8ce24e07f2f930aa92e53c703e9b8711..e74a89792f01d515d61198cdcf24e998fee2a29d 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -561,6 +561,12 @@ SHLIB_EXPORT_FILE=$(srcdir)/$(LIBPREFIX)$(LIBBASE).exports
 # it to another, intermediate form for the linker.
 SHLIB_EXPORT_FILE_DEP=@SHLIB_EXPORT_FILE_DEP@
 
+# Export file checker to run when building in maintainer mode on
+# Linux.  This gets included in LDCOMBINE_TAIL.
+EXPORT_CHECK_CMD = && $(PERL) -w $(top_srcdir)/util/export-check.pl \
+       $(SHLIB_EXPORT_FILE) $@
+EXPORT_CHECK = @MAINT@ $(EXPORT_CHECK_CMD)
+
 # Command to run to build a shared library.
 # In systems that require multiple commands, like AIX, it may need
 # to change to rearrange where the various parameters fit in.

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 9dcf7972ab973bf4eecd7fc7b1838f8fc7f5d2cb..f5eb6e3d05850c837112cbaacabf81a6d09160aa 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -423,8 +423,8 @@ mips-*-netbsd*)
        # Linux ld doesn't default to stuffing the SONAME field...
        # Use objdump -x to examine the fields of the library
        LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT),--no-undefined'
-       # 
-       LDCOMBINE_TAIL='-Wl,--version-script binutils.versions && $(PERL) -w $(top_srcdir)/util/export-check.pl $(SHLIB_EXPORT_FILE) $@'
+       # $(EXPORT_CHECK) runs export-check.pl when in maintainer mode.
+       LDCOMBINE_TAIL='-Wl,--version-script binutils.versions $(EXPORT_CHECK)'
        SHLIB_EXPORT_FILE_DEP=binutils.versions
        RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
        # For cases where we do have dependencies on other libraries