Permalink
Browse files

Bug 851342 - Two new spidermonkey builds, and allow a 'config.try' ov…

…erride as well. r=bhearsum
  • Loading branch information...
1 parent 8fbafa0 commit 4042716cad6db829255716448a2d74c66878ab3d @hotsphink hotsphink committed Mar 14, 2013
@@ -0,0 +1,3 @@
+--enable-optimize
+--enable-debug
+--enable-exact-rooting
@@ -0,0 +1,4 @@
+--enable-optimize
+--enable-debug
+--enable-exact-rooting
+--enable-gcgenerational
@@ -78,15 +78,20 @@ $PYTHON $SCRIPTS_DIR/buildfarm/utils/hgtool.py "${hgtool_args[@]}" $HG_REPO src
(cd src/js/src; autoconf-2.13 || autoconf2.13)
+TRY_OVERRIDE=src/js/src/config.try
+if [ -r $TRY_OVERRIDE ]; then
+ CONFIGURE_ARGS=$(cat $TRY_OVERRIDE)
+else
+ CONFIGURE_ARGS=$(cat $SPIDERDIR/$VARIANT)
+fi
+
test -d objdir || mkdir objdir
cd objdir
OBJDIR=$PWD
echo OBJDIR is $OBJDIR
-CONFIGURE_ARGS=$(cat $SPIDERDIR/$VARIANT)
-
NSPR64=""
if [[ "$OSTYPE" == darwin* ]]; then
NSPR64="--enable-64bit"
@@ -127,7 +132,7 @@ else
fi
../../src/js/src/configure $CONFIGURE_ARGS --with-dist-dir=$OBJDIR/dist --prefix=$OBJDIR/dist --with-nspr-prefix=$OBJDIR/dist --with-nspr-cflags="$NSPR_CFLAGS" --with-nspr-libs="$NSPR_LIBS" || exit 2
-make || exit 2
+make -s -w || exit 2
cp -p ../../src/build/unix/run-mozilla.sh $OBJDIR/dist/bin
# The Root Analysis tests run in a special GC Zeal mode.

0 comments on commit 4042716

Please sign in to comment.