Skip to content

Commit

Permalink
Revert "[embedlite] Enable startup cache for arm builds. Fixes JB#35271"
Browse files Browse the repository at this point in the history
This reverts commit a5d6132.
  • Loading branch information
rainemak committed Jun 14, 2016
1 parent 82bc83a commit 55b9712
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions rpm/xulrunner-qt5.spec
Expand Up @@ -179,14 +179,13 @@ echo "export PYTHONPATH=$PYTHONPATH" >> "%BUILD_DIR"/rpm-shared.env
echo "export SBOX_REDIRECT_FORCE=/usr/bin/python" >> "%BUILD_DIR"/rpm-shared.env
%endif
echo "export MOZCONFIG=%BUILD_DIR/mozconfig" >> "%BUILD_DIR"/rpm-shared.env
echo "export QT_QPA_PLATFORM=minimal" >> "%BUILD_DIR"/rpm-shared.env

%build
source "%BUILD_DIR"/rpm-shared.env
# hack for when not using virtualenv
ln -sf "%BUILD_DIR"/config.status $PWD/build/config.status

echo "## Added by xulrunner-qt.spec:" >> "$MOZCONFIG"
printf "#\n# Added by xulrunner-qt.spec:\n#" >> "$MOZCONFIG"
%ifarch %arm
echo "ac_add_options --with-arm-kuser" >> "$MOZCONFIG"
echo "ac_add_options --with-float-abi=toolchain-default" >> "$MOZCONFIG"
Expand Down Expand Up @@ -236,11 +235,8 @@ echo "ac_add_options --with-app-name=%{name}" >> "$MOZCONFIG"
echo "ac_add_options --with-system-bz2" >> "${MOZCONFIG}"
%endif

%ifarch %ix86
# https://bugzilla.mozilla.org/show_bug.cgi?id=1002002
echo "ac_add_options --disable-startupcache" >> "$MOZCONFIG"
%endif
echo "ac_add_options --enable-chrome-format=omni" >> "$MOZCONFIG"

%{__make} -f client.mk build STRIP="/bin/true" %{?jobs:MOZ_MAKE_FLAGS="-j%jobs"}

Expand Down

0 comments on commit 55b9712

Please sign in to comment.