Merge pull request #121290 from petabyteboy/feature/firefox-latest-rust
This commit is contained in:
commit
0ae04ca063
|
@ -9,7 +9,7 @@
|
||||||
, hunspell, libevent, libstartup_notification
|
, hunspell, libevent, libstartup_notification
|
||||||
, libvpx_1_8
|
, libvpx_1_8
|
||||||
, icu67, libpng, jemalloc, glib, pciutils
|
, icu67, libpng, jemalloc, glib, pciutils
|
||||||
, autoconf213, which, gnused, rustPackages, rustPackages_1_45
|
, autoconf213, which, gnused, rustPackages
|
||||||
, rust-cbindgen, nodejs, nasm, fetchpatch
|
, rust-cbindgen, nodejs, nasm, fetchpatch
|
||||||
, gnum4
|
, gnum4
|
||||||
, debugBuild ? false
|
, debugBuild ? false
|
||||||
|
@ -90,19 +90,13 @@ let
|
||||||
then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
|
then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
|
||||||
else "/bin";
|
else "/bin";
|
||||||
|
|
||||||
# 78 ESR won't build with rustc 1.47
|
inherit (rustPackages) rustc cargo;
|
||||||
inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
|
|
||||||
rustc cargo;
|
|
||||||
|
|
||||||
# Darwin's stdenv provides the default llvmPackages version, match that since
|
# Darwin's stdenv provides the default llvmPackages version, match that since
|
||||||
# clang LTO on Darwin is broken so the stdenv is not being changed.
|
# clang LTO on Darwin is broken so the stdenv is not being changed.
|
||||||
# Target the LLVM version that rustc -Vv reports it is built with for LTO.
|
|
||||||
# rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11
|
|
||||||
llvmPackages = if stdenv.isDarwin
|
llvmPackages = if stdenv.isDarwin
|
||||||
then buildPackages.llvmPackages
|
then buildPackages.llvmPackages
|
||||||
else if lib.versionAtLeast rustc.llvm.version "11"
|
else buildPackages.llvmPackages_11;
|
||||||
then buildPackages.llvmPackages_11
|
|
||||||
else buildPackages.llvmPackages_10;
|
|
||||||
|
|
||||||
# When LTO for Darwin is fixed, the following will need updating as lld
|
# When LTO for Darwin is fixed, the following will need updating as lld
|
||||||
# doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
|
# doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
|
||||||
|
|
Loading…
Reference in a new issue