Skip to content

gcc: drop unused libelf dependency #187234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trofi merged 1 commit into from
Aug 19, 2022
Merged

gcc: drop unused libelf dependency #187234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/10/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,9 +28,6 @@
, buildPackages
}:

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -173,7 +169,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)
Expand Down Expand Up @@ -203,7 +199,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl

enableLTO
enableMultilib
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,9 +28,6 @@
, buildPackages
}:

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -181,7 +177,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)
Expand Down Expand Up @@ -211,7 +207,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl

enableLTO
enableMultilib
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,9 +28,6 @@
, buildPackages
}:

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -206,7 +202,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl

enableLTO
enableMultilib
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/4.8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
Expand All @@ -39,9 +38,6 @@ assert langJava -> zip != null && unzip != null
# We enable the isl cloog backend.
assert cloog != null -> isl != null;

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -179,7 +175,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 (cloog != null) cloog)
++ (optional (isl != null) isl)
Expand Down Expand Up @@ -210,7 +206,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
cloog

enableLTO
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/4.9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
Expand All @@ -39,9 +38,6 @@ assert langJava -> zip != null && unzip != null
# We enable the isl cloog backend.
assert cloog != null -> isl != null;

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -199,7 +195,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 (cloog != null) cloog)
++ (optional (isl != null) isl)
Expand Down Expand Up @@ -230,7 +226,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl
cloog

enableLTO
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, gnatboot ? null
Expand All @@ -40,9 +39,6 @@ assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null
&& perl != null; # for `--enable-java-home'

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -210,7 +206,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)
Expand Down Expand Up @@ -242,7 +238,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl

enableLTO
enableMultilib
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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
, enableMultilib ? false
Expand All @@ -26,9 +25,6 @@
, buildPackages
}:

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -178,7 +174,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)
Expand Down Expand Up @@ -209,7 +205,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl

enableLTO
enableMultilib
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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
, enableMultilib ? false
Expand All @@ -26,9 +25,6 @@
, buildPackages
}:

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -162,7 +158,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)
Expand Down Expand Up @@ -192,7 +188,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl

enableLTO
enableMultilib
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/compilers/gcc/9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -34,9 +33,6 @@
# cgit) that are needed here should be included directly in Nixpkgs as
# files.

# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;

# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;

Expand Down Expand Up @@ -175,7 +171,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)
Expand Down Expand Up @@ -205,7 +201,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross
version

gmp mpfr libmpc libelf isl
gmp mpfr libmpc isl

enableLTO
enableMultilib
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/compilers/gcc/common/configure-flags.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, crossStageStatic, libcCross
, version

, gmp, mpfr, libmpc, libelf, isl
, gmp, mpfr, libmpc, isl
, cloog ? null

, enableLTO
Expand Down Expand Up @@ -110,7 +110,6 @@ let
"--with-mpfr-lib=${mpfr.out}/lib"
"--with-mpc=${libmpc}"
]
++ lib.optional (libelf != null) "--with-libelf=${libelf}"
++ lib.optionals (!crossStageStatic) [
(if libcCross == null
then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"
Expand Down