Merge branch 'master' into f30
This commit is contained in:
commit
df51ac391b
@ -554,8 +554,9 @@ MOZ_SMP_FLAGS=-j1
|
|||||||
[ -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
|
||||||
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
|
# Temporary disabled to test koji build failures
|
||||||
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
|
#[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
|
||||||
|
#[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
||||||
|
Loading…
Reference in New Issue
Block a user