Bug 926126 - Enable pseudo derecurse on releng builds, and enable parallel export; r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 13 Oct 2013 09:19:46 +0900
changeset 164513 bf040664a90539bc9166495bc8e42462c52c2ec6
parent 164512 e061f3176d005ee17a77c7c36f3035006c422494
child 164514 ad7ca67b369bd56c62ed3b1d1a9022cb2b345fb8
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs926126
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 926126 - Enable pseudo derecurse on releng builds, and enable parallel export; r=gps
build/autoconf/compiler-opts.m4
js/src/build/autoconf/compiler-opts.m4
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -166,20 +166,20 @@ AC_DEFUN([MOZ_COMPILER_OPTS],
   MOZ_ARG_ENABLE_BOOL(release,
   [  --enable-release        Build with more conservative, release engineering-oriented options.
                           This may slow down builds.],
       DEVELOPER_OPTIONS=,
       DEVELOPER_OPTIONS=1)
 
   AC_SUBST(DEVELOPER_OPTIONS)
 
-  if test -n "$DEVELOPER_OPTIONS" -a "${MOZ_PSEUDO_DERECURSE-unset}" = unset; then
+  if test "${MOZ_PSEUDO_DERECURSE-unset}" = unset; then
     dnl Don't enable on pymake, because of bug 918652. Bug 912979 is an annoyance
     dnl with pymake, too.
-    MOZ_PSEUDO_DERECURSE=no-parallel-export,no-pymake,no-skip
+    MOZ_PSEUDO_DERECURSE=no-pymake,no-skip
   fi
 
   MOZ_DEBUGGING_OPTS
   MOZ_RTTI
 if test "$CLANG_CXX"; then
     ## We disable return-type-c-linkage because jsval is defined as a C++ type but is
     ## returned by C functions. This is possible because we use knowledge about the ABI
     ## to typedef it to a C type with the same layout when the headers are included
--- a/js/src/build/autoconf/compiler-opts.m4
+++ b/js/src/build/autoconf/compiler-opts.m4
@@ -166,20 +166,20 @@ AC_DEFUN([MOZ_COMPILER_OPTS],
   MOZ_ARG_ENABLE_BOOL(release,
   [  --enable-release        Build with more conservative, release engineering-oriented options.
                           This may slow down builds.],
       DEVELOPER_OPTIONS=,
       DEVELOPER_OPTIONS=1)
 
   AC_SUBST(DEVELOPER_OPTIONS)
 
-  if test -n "$DEVELOPER_OPTIONS" -a "${MOZ_PSEUDO_DERECURSE-unset}" = unset; then
+  if test "${MOZ_PSEUDO_DERECURSE-unset}" = unset; then
     dnl Don't enable on pymake, because of bug 918652. Bug 912979 is an annoyance
     dnl with pymake, too.
-    MOZ_PSEUDO_DERECURSE=no-parallel-export,no-pymake,no-skip
+    MOZ_PSEUDO_DERECURSE=no-pymake,no-skip
   fi
 
   MOZ_DEBUGGING_OPTS
   MOZ_RTTI
 if test "$CLANG_CXX"; then
     ## We disable return-type-c-linkage because jsval is defined as a C++ type but is
     ## returned by C functions. This is possible because we use knowledge about the ABI
     ## to typedef it to a C type with the same layout when the headers are included