diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 00:44:07 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 13:33:16 +0100 |
| commit | 5f2d96ba2e8324fa4488fc689f324dbbb25be486 (patch) | |
| tree | a03537dc3ed793be2bebe300d2d112945989a9f7 /pkgs/development/libraries/glibc | |
| parent | a13649c6b127aabb04377a4239f77792b928adbc (diff) | |
| download | nixpkgs-5f2d96ba2e8324fa4488fc689f324dbbb25be486.tar nixpkgs-5f2d96ba2e8324fa4488fc689f324dbbb25be486.tar.gz nixpkgs-5f2d96ba2e8324fa4488fc689f324dbbb25be486.tar.bz2 nixpkgs-5f2d96ba2e8324fa4488fc689f324dbbb25be486.tar.lz nixpkgs-5f2d96ba2e8324fa4488fc689f324dbbb25be486.tar.xz nixpkgs-5f2d96ba2e8324fa4488fc689f324dbbb25be486.tar.zst nixpkgs-5f2d96ba2e8324fa4488fc689f324dbbb25be486.zip | |
glibc: NIX_CFLAGS_COMPILE -> always string
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 50b359da96c..2abc8b7ea66 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -47,14 +47,14 @@ callPackage ./common.nix { inherit stdenv; } { # musl-specific flags below. # At next change to non-musl glibc builds, remove this `then` # and the above condition, instead keeping only the `else` below. - then (if withGd then "-Wno-error=stringop-truncation" else null) + then (stdenv.lib.optionalString withGd "-Wno-error=stringop-truncation") else - builtins.concatLists [ + builtins.toString (builtins.concatLists [ (stdenv.lib.optional withGd "-Wno-error=stringop-truncation") # 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") - ]; + ]); # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new |