summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2012-01-10 14:24:59 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-11 15:59:51 +0100
commita7f4139af02d0ace2c0a408668a51505f1f964e4 (patch)
treeca1ef5c62c3cf4d8761245ec564e42e36de4293f
parentf29e92e96c0074a9937508edb01eafdbda62ea11 (diff)
Don't enable V8's snapshot feature when building inside scratchbox for ARM
It will result in QEMU crashing. Change-Id: Ie2f607b6335ae0d08b9a6d67acc22ea666bcd780 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index a56dacdac0..c057351e96 100755
--- a/configure
+++ b/configure
@@ -7239,6 +7239,11 @@ else
*) canUseV8Snapshot="no"
;;
esac
+ else
+ if [ -n "$_SBOX_DIR" -a "$CFG_ARCH" == "arm" ]; then
+ # QEMU crashes when building inside Scratchbox with an ARM target
+ canUseV8Snapshot="no"
+ fi
fi
if [ "$CFG_V8SNAPSHOT" = "auto" ]; then
CFG_V8SNAPSHOT="$canUseV8Snapshot"