diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-01 17:42:03 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-01 17:42:03 +0100 |
| commit | ea8ae88f0447b0cf7aa8a07844cac78e001f5622 (patch) | |
| tree | 3c9e5c92d6f3fd72d2a622ee39ddd52306010f28 /pkgs/development/libraries/glibc | |
| parent | 1bb18d9e8dbe537225c8d6ae8476aae3c40df368 (diff) | |
| parent | 5ff1a53a32b332e3b1a1e295e12e184c65833d13 (diff) | |
Merge branch 'staging' into glibc230
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 9327e0d936c5..150681ebda18 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -54,9 +54,10 @@ callPackage ./common.nix { inherit stdenv; } { # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") - (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + (stdenv.lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'" # New warning as of GCC 9 + # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805 "-Wno-error=missing-attributes" ]) ]); |