Skip to content

Commit

Permalink
binutils: remove autoreconfHook on iOS (NixOS#350251)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilazy authored Oct 21, 2024
2 parents d9d2bfd + 99d0e49 commit 4a5e528
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions pkgs/development/tools/misc/binutils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ let
in

{ stdenv
, autoreconfHook
, autoconf269, automake, libtool
, bison
, buildPackages
Expand Down Expand Up @@ -116,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
bison
perl
]
++ lib.optionals targetPlatform.isiOS [ autoreconfHook ]
++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ]
++ lib.optionals targetPlatform.isVc4 [ flex ]
;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17022,13 +17022,11 @@ with pkgs;
bingrep = callPackage ../development/tools/analysis/bingrep { };

binutils-unwrapped = callPackage ../development/tools/misc/binutils {
autoreconfHook = autoreconfHook269;
inherit (darwin.apple_sdk.frameworks) CoreServices;
# FHS sys dirs presumably only have stuff for the build platform
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
};
binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils {
autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
inherit (darwin.apple_sdk.frameworks) CoreServices;
# FHS sys dirs presumably only have stuff for the build platform
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
Expand Down

0 comments on commit 4a5e528

Please sign in to comment.