Skip to content

Commit 99d0e49

Browse files
committed
binutils: remove autoreconfHook on iOS
This was added in ebc2243 ("binutils: Add iOS as a supported platform"), at the same time as a patch. That patch was removed in 045c2d2 ("binutils-unwrapped: remove broken iOS patch"), and I'm not sure what other reason there would be for autoreconfHook to be required specifically for iOS, so I think we can remove it. It's not possible to test since iOS cross has been broken for months, and keeping this around is making other refactors (like adding cross binutils packages) harder.
1 parent 227e4d2 commit 99d0e49

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

pkgs/development/tools/misc/binutils/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ let
33
in
44

55
{ stdenv
6-
, autoreconfHook
76
, autoconf269, automake, libtool
87
, bison
98
, buildPackages
@@ -116,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
116115
bison
117116
perl
118117
]
119-
++ lib.optionals targetPlatform.isiOS [ autoreconfHook ]
120118
++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ]
121119
++ lib.optionals targetPlatform.isVc4 [ flex ]
122120
;

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17022,13 +17022,11 @@ with pkgs;
1702217022
bingrep = callPackage ../development/tools/analysis/bingrep { };
1702317023

1702417024
binutils-unwrapped = callPackage ../development/tools/misc/binutils {
17025-
autoreconfHook = autoreconfHook269;
1702617025
inherit (darwin.apple_sdk.frameworks) CoreServices;
1702717026
# FHS sys dirs presumably only have stuff for the build platform
1702817027
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
1702917028
};
1703017029
binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils {
17031-
autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
1703217030
inherit (darwin.apple_sdk.frameworks) CoreServices;
1703317031
# FHS sys dirs presumably only have stuff for the build platform
1703417032
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;

0 commit comments

Comments
 (0)