diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-08-19 19:16:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-19 19:16:35 +0100 |
| commit | 7f458e5c509e5165cf71f3871c4f0df63dc77835 (patch) | |
| tree | 5e1cac19a1636d5007849806a37e4690ce28f57e /pkgs/development/compilers/gcc/10/default.nix | |
| parent | 8b202db44b8a265ea93b51ae636d02aa5d64ec63 (diff) | |
| parent | 3b60b31d6072055195a07b175c4999326e26ab14 (diff) | |
Merge pull request #187234 from trofi/drop-libelf-from-gcc
gcc: drop unused libelf dependency
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 4476f1a397655..e8dfe670dc324 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -14,7 +14,6 @@ , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf -, libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -29,9 +28,6 @@ , buildPackages }: -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - # Make sure we get GNU sed. assert stdenv.buildPlatform.isDarwin -> gnused != null; @@ -176,7 +172,7 @@ stdenv.mkDerivation ({ ++ optional targetPlatform.isLinux patchelf; buildInputs = [ - gmp mpfr libmpc libelf + gmp mpfr libmpc targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -203,7 +199,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross version - gmp mpfr libmpc libelf isl + gmp mpfr libmpc isl enableLTO enableMultilib |