diff options
| author | Martin Stransky <stransky@redhat.com> | 2018-11-13 23:48:36 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2018-11-13 23:48:36 +0100 |
| commit | 491f1538b0a264eaa86f5fa5a5aae04437312faf (patch) | |
| tree | 696bc1ae742870ba14ba4a1e017d663cfd14f212 | |
| parent | Merge branch 'master' into f28 (diff) | |
| parent | Added an option to build with clang/llvm. (diff) | |
| download | librewolf-fedora-ff-491f1538b0a264eaa86f5fa5a5aae04437312faf.tar.gz librewolf-fedora-ff-491f1538b0a264eaa86f5fa5a5aae04437312faf.tar.bz2 librewolf-fedora-ff-491f1538b0a264eaa86f5fa5a5aae04437312faf.zip | |
Merge branch 'master' into f28
| -rw-r--r-- | firefox-mozconfig | 2 | ||||
| -rw-r--r-- | firefox.spec | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig index a64bb3d..44fe32c 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -15,8 +15,8 @@ ac_add_options --enable-pulseaudio ac_add_options --with-system-icu ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key ac_add_options --with-google-api-keyfile=../google-api-key -ac_add_options --enable-release ac_add_options --enable-pie +ac_add_options --enable-release ac_add_options --update-channel=release # Workaround for mozbz#1341234 ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)" diff --git a/firefox.spec b/firefox.spec index 85b6687..31997c1 100644 --- a/firefox.spec +++ b/firefox.spec @@ -6,7 +6,7 @@ %global system_libicu 0 %global hardened_build 1 %global system_jpeg 1 -%global build_with_clang 1 +%global build_with_clang 0 %if 0%{?fedora} > 29 %global wayland_backend_default 1 @@ -199,6 +199,9 @@ BuildRequires: llvm BuildRequires: llvm-devel BuildRequires: clang BuildRequires: clang-libs +%if %{?build_with_clang} +BuildRequires: lld +%endif %if 0%{?fedora} > 27 BuildRequires: pipewire-devel %endif @@ -561,7 +564,11 @@ export LIBDIR='%{_libdir}' %if %{?build_with_clang} export CC=clang export CXX=clang++ -export LINKER=lld-link +export LLVM_PROFDATA="llvm-profdata" +export AR="llvm-ar" +export NM="llvm-nm" +export RANLIB="llvm-ranlib" +echo "ac_add_options --enable-linker=lld" >> .mozconfig %endif MOZ_SMP_FLAGS=-j1 @@ -920,7 +927,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Tue Nov 13 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-6 -- Build with clang/llvm +- Added an option to build with clang/llvm. * Tue Nov 6 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-5 - Added fix for mozbz#1502457- disable Contextual Feature |