summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2019-12-10 09:20:47 +0100
committerMartin Stransky <stransky@redhat.com>2019-12-10 09:20:47 +0100
commitc2a818ae1aa857bed901d7aeeb0712d34e7a8ef4 (patch)
tree2ad7574abcd5887e366e45fde426b627cb005aab
parentMerge branch 'master' into f31 (diff)
parentFix for asan build (diff)
downloadlibrewolf-fedora-ff-c2a818ae1aa857bed901d7aeeb0712d34e7a8ef4.tar.gz
librewolf-fedora-ff-c2a818ae1aa857bed901d7aeeb0712d34e7a8ef4.tar.bz2
librewolf-fedora-ff-c2a818ae1aa857bed901d7aeeb0712d34e7a8ef4.zip
Merge branch 'master' into f31
-rw-r--r--firefox.spec8
1 files changed, 3 insertions, 5 deletions
diff --git a/firefox.spec b/firefox.spec
index 395bbd5..5da0be5 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -9,9 +9,11 @@ ExcludeArch: armv7hl
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
ExcludeArch: s390x
+%global enable_mozilla_crashreporter 0
%ifarch x86_64 %{ix86}
%global enable_mozilla_crashreporter 1
-%else
+%endif
+%if %{build_with_asan}
%global enable_mozilla_crashreporter 0
%endif
@@ -462,10 +464,6 @@ echo "ac_add_options --disable-ion" >> .mozconfig
%if %{build_with_asan}
echo "ac_add_options --enable-address-sanitizer" >> .mozconfig
echo "ac_add_options --disable-jemalloc" >> .mozconfig
-echo "ac_add_options --disable-crashreporter" >> .mozconfig
-%ifarch x86_64 %{ix86}
-echo "ac_add_options --disable-elf-hack" >> .mozconfig
-%endif
%endif
echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
bgstack15