summary refs log tree commit diff
path: root/pkgs/stdenv/linux
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-05-02 18:49:43 +0300
committerGitHub <noreply@github.com>2023-05-02 18:49:43 +0300
commite6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b (patch)
treea4f192a8c9ee5c89eeb125a09ca3bf7f11a94c6b /pkgs/stdenv/linux
parent82c76f26dbdbbf3914fa6fda52f7dfae40a23ea6 (diff)
parentb017e29705ff6bf879bd4c56c04ae4f1123272ef (diff)
downloadnixpkgs-e6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b.tar
nixpkgs-e6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b.tar.gz
nixpkgs-e6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b.tar.bz2
nixpkgs-e6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b.tar.lz
nixpkgs-e6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b.tar.xz
nixpkgs-e6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b.tar.zst
nixpkgs-e6e3e4da3483ad2d6a2723ba61e5f3fbdca5081b.zip
Merge pull request #229372 from wegank/loongarch64-native-bootstrap
stdenv: always update config script on loongarch64-linux
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r--pkgs/stdenv/linux/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 17759d9fa1d..6a743f60c9b 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;
   })