rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Enabled only 2 parallel build tasks on i686/arm, use gold linker with gcc

Browse Source
This commit is contained in:
Martin Stransky 2018-12-10 10:38:32 +01:00
parent 30f48bfaba
commit 4ed6b0c90a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firefox.spec
View File

@ -576,15 +576,21 @@ echo "ac_add_options --enable-linker=lld" >> .mozconfig
%else %else
export CC=gcc export CC=gcc
export CXX=g++ export CXX=g++
echo "ac_add_options --enable-linker=gold" >> .mozconfig
%endif %endif
%if %{?build_with_pgo} %if 0%{?build_with_pgo}
echo "ac_add_options MOZ_PGO=1" >> .mozconfig echo "ac_add_options MOZ_PGO=1" >> .mozconfig
%endif %endif
MOZ_SMP_FLAGS=-j1 MOZ_SMP_FLAGS=-j1
# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel, # On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
# however builds tend to fail on other arches when building in parallel. # however builds tend to fail on other arches when building in parallel.
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64 %ifarch %{ix86} %{arm}
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
%endif
%ifarch x86_64 ppc ppc64 ppc64le aarch64
[ -z "$RPM_BUILD_NCPUS" ] && \ [ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
@ -592,7 +598,6 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
%endif %endif
#make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1"
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1" export MOZ_SERVICES_SYNC="1"
export STRIP=/bin/true export STRIP=/bin/true