diff options
| author | Emery Hemingway <ehmry@posteo.net> | 2020-05-07 14:02:14 +0530 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2020-08-02 22:37:39 +0200 |
| commit | f5ef00a12ff23f120f02eeb8820bf3e7338506e4 (patch) | |
| tree | 8035095b9bdbc57c778e45b03a6e4dd248033e5e /pkgs/stdenv/cross/default.nix | |
| parent | 67af42e35ff6e233f301bdd26c774cef1c236025 (diff) | |
| download | nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.gz nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.bz2 nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.lz nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.xz nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.zst nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.zip | |
gnu-config: 2019-04-15 -> 2020-05-04
Update gnu-config (config.sub, config.guess) to suport the Genode platform and apply the updateAutotoolsGnuConfigScriptsHook to Genode cross-compilation.
Diffstat (limited to 'pkgs/stdenv/cross/default.nix')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 0f575289889..6ac03b7908f 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -72,7 +72,8 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode; + in f hostPlatform && !(f buildPlatform) ) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs |