Build with enable-replace-malloc on intel only

This commit is contained in:
Martin Stransky 2024-02-01 14:25:58 +01:00
parent 7609d4e357
commit 69510db050
2 changed files with 11 additions and 1 deletions

View File

@ -16,7 +16,6 @@ ac_add_options --enable-js-shell
ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --with-unsigned-addon-scopes=app,system
ac_add_options --without-sysroot ac_add_options --without-sysroot
ac_add_options --without-wasm-sandboxed-libraries ac_add_options --without-wasm-sandboxed-libraries
ac_add_options --enable-replace-malloc
export BUILD_OFFICIAL=1 export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1

View File

@ -29,6 +29,11 @@ ExcludeArch: i686
%global system_libevent 1 %global system_libevent 1
%global build_with_asan 0 %global build_with_asan 0
%global test_on_wayland 0 %global test_on_wayland 0
%ifarch x86_64 %{ix86}
%global enable_replace_malloc 1
%else
%global enable_replace_malloc 0
%endif
%if "%{toolchain}" == "clang" %if "%{toolchain}" == "clang"
%global build_with_clang 1 %global build_with_clang 1
@ -437,7 +442,9 @@ BuildRequires: pciutils-libs
BuildRequires: mesa-libgbm-devel BuildRequires: mesa-libgbm-devel
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
# Required for --enable-replace-malloc # Required for --enable-replace-malloc
%if %{enable_replace_malloc}
BuildRequires: libstdc++-static BuildRequires: libstdc++-static
%endif
Obsoletes: mozilla <= 37:1.7.13 Obsoletes: mozilla <= 37:1.7.13
Provides: webclient Provides: webclient
@ -690,6 +697,10 @@ echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key
# where to look # where to look
echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig
%if %{enable_replace_malloc}
ac_add_options --enable-replace-malloc
%endif
echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
# Remove executable bit to make brp-mangle-shebangs happy. # Remove executable bit to make brp-mangle-shebangs happy.