Bugzilla: 51465. strip binaries on optimized builds

nsprpub/config/Linux.mk

@@ -115,6 +115,8 @@ endif
 MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(notdir $@)
 ifdef BUILD_OPT
 OPTIMIZER		= -O2
+#   invoke 'strip' on *.so files in optimized builds
+STRIP = strip
 endif
 
 ######################################################################

nsprpub/config/UNIX.mk

@@ -1,91 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-PR_UNIXOS	= 1
-XP_DEFINE	= -DXP_UNIX
-OBJ_SUFFIX	= o
-LIB_SUFFIX	= a
-DLL_SUFFIX	= so
-AR		= ar cr $@
-
-ifdef BUILD_OPT
-OPTIMIZER	= -O
-DEFINES		= -UDEBUG -DNDEBUG
-OBJDIR_TAG	= _OPT
-else
-OPTIMIZER	= -g
-DEFINES		= -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
-OBJDIR_TAG	= _DBG
-endif
-
-# Name of the binary code directories
-ifdef MOZILLA_CLIENT
-OBJDIR_NAME	= $(OS_CONFIG)$(CPU_ARCH_TAG)$(OBJDIR_TAG).OBJ
-else
-OBJDIR_NAME	= $(OS_CONFIG)$(CPU_ARCH_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
-endif
-
-MKDEPEND_DIR    = $(DEPTH)/config/mkdepend
-MKDEPEND 	= $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
-MKDEPENDENCIES  = $(OBJDIR)/depend.mk
-
-####################################################################
-#
-# One can define the makefile variable NSDISTMODE to control
-# how files are published to the 'dist' directory.  If not
-# defined, the default is "install using relative symbolic
-# links".  The two possible values are "copy", which copies files
-# but preserves source mtime, and "absolute_symlink", which
-# installs using absolute symbolic links.  The "absolute_symlink"
-# option requires NFSPWD.
-#
-####################################################################
-
-NSINSTALL	= $(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall
-
-ifeq ($(NSDISTMODE),copy)
-# copy files, but preserve source mtime
-INSTALL		= $(NSINSTALL) -t
-else
-ifeq ($(NSDISTMODE),absolute_symlink)
-# install using absolute symbolic links
-INSTALL		= $(NSINSTALL) -L `$(NFSPWD)`
-else
-# install using relative symbolic links
-INSTALL		= $(NSINSTALL) -R
-endif
-endif
-
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); else true; fi
-endef

nsprpub/config/autoconf.mk.in

@@ -10,6 +10,8 @@ DLL_SUFFIX	= @DLL_SUFFIX@
 MOD_VERSION	= @NSPR_VERSION@
 MOD_NAME	= @NSPR_MODNAME@
 
+BUILD_OPT	= @MOZ_OPTIMIZE@
+
 USE_CPLUS	= @USE_CPLUS@
 USE_IPV6	= @USE_IPV6@
 USE_N32		= @USE_N32@
@@ -32,6 +34,7 @@ PERL		= @PERL@
 DLLTOOL		= @DLLTOOL@
 WINDRES		= @WINDRES@
 RC		= $(WINDRES)
+STRIP		= @STRIP@
 
 OS_CFLAGS	= @CFLAGS@ $(DSO_CFLAGS)
 OS_CXXFLAGS	= @CXXFLAGS@ $(DSO_CFLAGS)

nsprpub/config/rules.mk

@@ -285,6 +285,9 @@ else
 	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS)
 endif
 endif
+ifdef BUILD_OPT
+	$(STRIP) $@
+endif
 
 $(LIBRARY): $(OBJS)
 	@$(MAKE_OBJDIR)
@@ -297,6 +300,9 @@ ifdef USE_AUTOCONF
 else
 	$(AR) $(OBJS) $(AR_EXTRA_ARGS)
 endif # USE_AUTOCONF
+endif
+ifdef BUILD_OPT
+	$(STRIP) $@
 endif
 	$(RANLIB) $@
 
@@ -371,6 +377,9 @@ endif   # OS2
 endif	# WINNT
 endif	# AIX 4.1
 endif   # USE_AUTOCONF
+ifdef BUILD_OPT
+	$(STRIP) $@
+endif
 
 
 ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))

nsprpub/configure.in

@@ -250,6 +250,7 @@ dnl ========================================================
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PATH_PROGS(PERL, perl5 perl, :)
+AC_PATH_PROGS(STRIP, strip, :)
 
 dnl ========================================================
 dnl Default platform specific options
@@ -1047,6 +1048,8 @@ AC_SUBST(HOST_CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(GNU_CC)
 
+AC_SUBST(MOZ_OPTIMIZE)
+
 AC_SUBST(USE_CPLUS)
 AC_SUBST(USE_IPV6)
 AC_SUBST(USE_N32)