diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-28 16:07:38 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-10-28 16:07:38 +0000 |
| commit | 3f01b576af96454d1302fe4312420776f3ed0755 (patch) | |
| tree | cd8d374073386b81fa7daa8faf0eb799d26b2611 /pkgs/development/libraries/gcc | |
| parent | 4e9d848b56d5b9a06634f3b8b9837aed561f285a (diff) | |
| parent | ea4da560fff51fb70b6cc7a37fb1275264d904b5 (diff) | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: nixos/doc/manual/from_md/release-notes/rl-2111.section.xml nixos/doc/manual/release-notes/rl-2111.section.md
Diffstat (limited to 'pkgs/development/libraries/gcc')
| -rw-r--r-- | pkgs/development/libraries/gcc/libstdc++/5.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index f963ae31e5c13..41c22da67b3c1 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { # being generated to make sure that they use our glibc. EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-crt1-cflags) $(cat $NIX_CC/nix-support/libc-cflags) -O2" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before)" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags || true) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before || true)" for i in $extraLDFlags; do EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i" done |