From 738bb4777cf08625adf22f50227377003598f7ad Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 Sep 2017 11:16:25 -0400 Subject: [PATCH] stdenv: Update autotools scripts on all Aarch64, not just Linux This is needed when cross-compiling for iOS (Aarch64 + Darwin). I also changed the syntax of the Linux stdenv for visual consistency, though that has no effect on semantics as the os is already guaranteed to be Linux. --- pkgs/stdenv/adapters.nix | 2 +- pkgs/stdenv/linux/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index ac382927b1b9..07d1c245b49c 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -105,7 +105,7 @@ rec { # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file - ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook + ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook ; # Cross-linking dynamic libraries, every buildInput should diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index fab1985b9765..e79ec48e9f42 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -219,7 +219,7 @@ in }; extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; }) @@ -251,7 +251,7 @@ in }; extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; }) # Construct the final stdenv. It uses the Glibc and GCC, and adds @@ -281,7 +281,7 @@ in extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; cc = prevStage.gcc; @@ -312,7 +312,7 @@ in glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] - ++ lib.optionals (system == "aarch64-linux") + ++ lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; overrides = self: super: {