Port bug 809803 from mozilla-central to comm-central - Move strip flags into STRIP_FLAGS. Needed to port Bug 813526 to fix bustage
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 06 Dec 2012 07:38:59 +0000
changeset 14502 0228cef8fb832e863f225a27f20828adb922a2f9
parent 14501 004743024049113ce92d283dc66031c674a8c6b0
child 14503 fe3d197d44c49847b2e1ca4f9ec45cba457444d3
push id845
push userbugzilla@standard8.plus.com
push dateTue, 19 Feb 2013 18:11:16 +0000
treeherdercomm-beta@ecc3ce2d7daa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs809803, 813526
Port bug 809803 from mozilla-central to comm-central - Move strip flags into STRIP_FLAGS. Needed to port Bug 813526 to fix bustage
configure.in
--- a/configure.in
+++ b/configure.in
@@ -1513,17 +1513,17 @@ ld.])
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     ;;
 
 *-bsdi*)
     dnl -pedantic doesn't play well with BSDI's _very_ modified gcc (shlicc2)
     _PEDANTIC=
     case $OS_RELEASE in
 	4.*|5.*)
-            STRIP="$STRIP -d"
+            STRIP_FLAGS="$STRIP_FLAGS -d"
             ;;
 	*)
 	    DSO_CFLAGS=''
 	    DSO_LDOPTS='-r'
 	    _WARNINGS_CFLAGS="-Wall"
 	    _WARNINGS_CXXFLAGS="-Wall"
 	    # The test above doesn't work properly, at least on 3.1.
 	    MKSHLIB_FORCE_ALL=''
@@ -1536,17 +1536,17 @@ ld.])
     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MOZ_OPTIMIZE_FLAGS="-O3"
     _PEDANTIC=
     CFLAGS="$CFLAGS -fno-common"
     CXXFLAGS="$CXXFLAGS -fno-common"
     DLL_SUFFIX=".dylib"
     DSO_LDOPTS=''
-    STRIP="$STRIP -x -S"
+    STRIP_FLAGS="$STRIP_FLAGS -x -S"
     _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
     # The ExceptionHandling framework is needed for Objective-C exception
     # logging code in nsObjCExceptions.h. Currently we only use that in debug
     # builds.
     MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"
 
     if test "x$lto_is_enabled" = "xyes"; then