Bug 669953 - don't pass "--enable-optimize --enable-debug --disable-optimize" to sub configure. r=khuey.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Mon, 10 Oct 2011 10:54:49 -0400
changeset 79850 17eecce51c43cd1e9f44bb502312db9ec47aa9b1
parent 79849 8586a8f3929fd0ecd1f1f897a3367a836064adac
child 79851 8e85383d821eb5d38c9fea754384ac271e4180ec
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs669953
milestone10.0a1
Bug 669953 - don't pass "--enable-optimize --enable-debug --disable-optimize" to sub configure. r=khuey. This patch makes us always pass --(enable|disable)-(optimizations|debug) to the nspr configure. That way we don't have to worry about defaults in two configures being in sync. It also removes the hack for trace malloc from the top level configure. If there are nspr only restrictions on tracing and optimizations, the nspr configure should handle them.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8784,22 +8784,23 @@ if test -n "$_WRAP_MALLOC"; then
     # Avoid doubling wrap malloc arguments
     _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--enable-wrap-malloc *//'`"
 fi
 
 if test -z "$MOZ_NATIVE_NSPR"; then
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
     if test -z "$MOZ_DEBUG"; then
         ac_configure_args="$ac_configure_args --disable-debug"
+    else
+        ac_configure_args="$ac_configure_args --enable-debug"
     fi
     if test "$MOZ_OPTIMIZE" = "1"; then
         ac_configure_args="$ac_configure_args --enable-optimize"
-    fi
-    if test "$OS_ARCH" = "WINNT" -a "$NS_TRACE_MALLOC"; then
-       ac_configure_args="$ac_configure_args --enable-debug --disable-optimize"
+    else
+        ac_configure_args="$ac_configure_args --disable-optimize"
     fi
     if test -n "$HAVE_64BIT_OS"; then
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
     if test -n "$USE_ARM_KUSER"; then
         ac_configure_args="$ac_configure_args --with-arm-kuser"
     fi
     AC_OUTPUT_SUBDIRS(nsprpub)