Skip to content

Commit

Permalink
libstdcxx5: fix build failure
Browse files Browse the repository at this point in the history
Package began failing after NixOS#107596

The `nix-support/libc-ldflags-before` file is no longer guaranteed to
exist, so this commit ensures the build continues without it.
  • Loading branch information
libjared committed Oct 26, 2021
1 parent 30f73c6 commit da1c6c8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gcc/libstdc++/5.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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) $(< "$NIX_BINTOOLS/nix-support/libc-ldflags-before" || true)"
for i in $extraLDFlags; do
EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i"
done
Expand Down

0 comments on commit da1c6c8

Please sign in to comment.