cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

firefox: limit disable-elf-hack to arm, x86{,_64}

Browse source 
This is a follow up to #106617 which brought LTO support but broke the
AArch64 Firefox builds.
This commit is contained in:
S. Nordin Abouzahra 2021-01-16 22:26:40 -05:00
parent 2fbc36f3d8
commit 00b75b7024
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -296,10 +296,9 @@ buildStdenv.mkDerivation ({
# https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 # https://bugzilla.mozilla.org/show_bug.cgi?id=1538724
# elf-hack is broken when using clang+lld: # elf-hack is broken when using clang+lld:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
++ lib.optionals ltoSupport [ ++ lib.optional ltoSupport "--enable-lto"
"--enable-lto" ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack"
"--disable-elf-hack" ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld"
] ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld"
++ flag alsaSupport "alsa" ++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio" ++ flag pulseaudioSupport "pulseaudio"