Merge branch 'master' into f31
This commit is contained in:
commit
c2a818ae1a
@ -9,9 +9,11 @@ ExcludeArch: armv7hl
|
|||||||
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
|
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
|
||||||
ExcludeArch: s390x
|
ExcludeArch: s390x
|
||||||
|
|
||||||
|
%global enable_mozilla_crashreporter 0
|
||||||
%ifarch x86_64 %{ix86}
|
%ifarch x86_64 %{ix86}
|
||||||
%global enable_mozilla_crashreporter 1
|
%global enable_mozilla_crashreporter 1
|
||||||
%else
|
%endif
|
||||||
|
%if %{build_with_asan}
|
||||||
%global enable_mozilla_crashreporter 0
|
%global enable_mozilla_crashreporter 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -462,10 +464,6 @@ echo "ac_add_options --disable-ion" >> .mozconfig
|
|||||||
%if %{build_with_asan}
|
%if %{build_with_asan}
|
||||||
echo "ac_add_options --enable-address-sanitizer" >> .mozconfig
|
echo "ac_add_options --enable-address-sanitizer" >> .mozconfig
|
||||||
echo "ac_add_options --disable-jemalloc" >> .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
|
%endif
|
||||||
|
|
||||||
echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
|
echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user