From b017e29705ff6bf879bd4c56c04ae4f1123272ef Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 2 May 2023 01:02:57 +0300 Subject: [PATCH] stdenv: always update config script on loongarch64-linux --- pkgs/stdenv/linux/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 17759d9fa1d7..6a743f60c9b2 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -310,6 +310,10 @@ in # top-level pkgs as an override either. perl = super.perl.override { enableThreading = false; enableCrypt = false; }; }; + + # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64. + extraNativeBuildInputs = + lib.optional (localSystem.isLoongArch64) prevStage.updateAutotoolsGnuConfigScriptsHook; }) # First rebuild of gcc; this is linked against all sorts of junk @@ -387,6 +391,10 @@ in ''; }); }; + + # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64. + extraNativeBuildInputs = + lib.optional (localSystem.isLoongArch64) prevStage.updateAutotoolsGnuConfigScriptsHook; }) # 2nd stdenv that contains our own rebuilt binutils and is used for @@ -469,9 +477,10 @@ in }; + # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64. # `libtool` comes with obsolete config.sub/config.guess that don't recognize Risc-V. extraNativeBuildInputs = - lib.optional (localSystem.isRiscV) prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional (localSystem.isLoongArch64 || localSystem.isRiscV) prevStage.updateAutotoolsGnuConfigScriptsHook; })