Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fc3e5df2a952
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01dfd41455ca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 30, 2020

  1. glibc: Fix build error due to warning with musl. Fixes #78805

    @nh2
    nh2 committed Jan 30, 2020
    Copy the full SHA
    8ef2c51 View commit details

  2. Merge pull request #78806 from nh2/issue-78805-glibc-musl-gcc-9-build… 

    …-error

glibc: Fix build error due to warning with musl
    @nh2
    nh2 authored Jan 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01dfd41 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/libraries/glibc/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/libraries/glibc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
])
]);