diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 31ad3c8..b3c34b1 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 12 17:33:29 UTC 2018 - Guillaume GARDET + +- Switch aarch64 builds back to gcc, not clang (bmo#1513605) +- Switch %arm builds back to gcc, not clang to avoid OOM +- Fix build flags when clang is not used +- Fix flags for clang ppc64 builds + ------------------------------------------------------------------- Tue Dec 11 08:45:56 UTC 2018 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 14df649..e4b118c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -31,9 +31,16 @@ %if 0%{?suse_version} > 1320 %define clang_build 1 %endif +# Except on aarch64 due to bmo#1513605 +# and on %%arm due to large ld memory requirements +%ifarch %arm aarch64 +%define clang_build 0 +%endif # PIE, full relro (x86_64 for now) +%ifnarch %arm aarch64 %define build_hardened 1 +%endif # Firefox only supports i686 %ifarch %ix86 @@ -303,6 +310,11 @@ export BUILD_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 %if 0%{?suse_version} <= 1320 export CC=gcc-7 +%else +%if 0%{?clang_build} == 0 +export CC=gcc +export CXX=g++ +%endif %endif export CFLAGS="%{optflags} -fno-strict-aliasing" # boo#986541: add -fno-delete-null-pointer-checks for gcc6 @@ -321,8 +333,10 @@ export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now" %endif %endif %ifarch ppc64 ppc64le +%if 0%{?clang_build} == 0 export CFLAGS="$CFLAGS -mminimal-toc" %endif +%endif export CXXFLAGS="$CFLAGS" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig %limit_build -m 1500