Unverified Commit 99d0e499 authored Oct 21, 2024 by Alyssa Ross

binutils: remove autoreconfHook on iOS

This was added in ebc22437 ("binutils: Add iOS as a supported
platform"), at the same time as a patch.  That patch was removed in
045c2d21 ("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.

parent 227e4d2b

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@ let
		in

		{ stdenv
		, autoreconfHook
		, autoconf269, automake, libtool
		, bison
		, buildPackages
		@@ -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 ]
		;

pkgs/top-level/all-packages.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;