Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1169199 - Check platform argument on linux SpiderMonkey shell build and specify target and host on 32bit build. r=sfink

Browse Source
This commit is contained in:
Tooru Fujisawa 2015-06-03 06:20:19 +09:00
parent bb60c1781d
commit 2caf3e87ee
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/src/devtools/automation/autospider.sh
View File

@ -91,8 +91,26 @@ elif [ "$OSTYPE" = "linux-gnu" ]; then
MAKEFLAGS=-j4
if [ "$VARIANT" = "arm-sim" ]; then
USE_64BIT=false
elif [ "$UNAME_M" = "x86_64" ]; then
USE_64BIT=true
else
case "$platform" in
linux64)
USE_64BIT=true
;;
linux64-debug)
USE_64BIT=true
;;
linux)
USE_64BIT=false
;;
linux-debug)
USE_64BIT=false
;;
*)
if [ "$UNAME_M" = "x86_64" ]; then
USE_64BIT=true
fi
;;
esac
fi
if [ "$UNAME_M" != "arm" ] && [ -n "$AUTOMATION" ]; then
@ -131,6 +149,11 @@ else
export CXX="${CXX:-/usr/bin/g++} -m32"
export AR=ar
fi
if [ "$OSTYPE" = "linux-gnu" ]; then
if [ "$UNAME_M" != "arm" ] && [ -n "$AUTOMATION" ]; then
CONFIGURE_ARGS="$CONFIGURE_ARGS --target=i686-pc-linux --host=i686-pc-linux"
fi
fi
fi
$SOURCE/js/src/configure $CONFIGURE_ARGS --enable-nspr-build --prefix=$OBJDIR/dist || exit 2