From 767bddbd80133ad4dab7a78dc95a84e616407629 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 13 Feb 2018 13:39:42 -0600 Subject: [PATCH] libbfd: manually update config.guess/config.sub Workaround for building "from" the bfd directory but needing to update files a level above. This needs to be done *after* autoreconf since autoreconf will replace these itself, apparently. --- pkgs/development/libraries/libbfd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 4b7b5b8dfa5..018239a3e77 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl, fetchpatch, autoreconfHook264, bison, binutils-raw +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw , libiberty, zlib }: @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { cd bfd ''; + postAutoreconf = '' + echo "Updating config.guess and config.sub from ${gnu-config}" + cp -f ${gnu-config}/config.{guess,sub} ../ + ''; + + # We update these ourselves + dontUpdateAutotoolsGnuConfigScripts = true; + nativeBuildInputs = [ autoreconfHook264 bison ]; buildInputs = [ libiberty zlib ];