diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-20 21:56:57 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-20 21:56:57 +0000 |
| commit | b9b1d958d0082723233644748f6a85ef21734ce8 (patch) | |
| tree | 0a0f8a84c9dc05dbd67e9acc6ab15746e1094a9e /pkgs/development/compilers/gcc/10/default.nix | |
| parent | c7475c80e109b480894d641bc781a024628ec34d (diff) | |
| parent | eac989c0a24cc1cd97eb3ae69bc5b7abbb1e1be0 (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/qt-6/modules/qtbase.nix pkgs/stdenv/linux/make-bootstrap-tools.nix
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 25eae9e77e0f0..76374201f456d 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -208,7 +208,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib |