Skip to content

Commit 8502512

Browse files
Merge pull request #142859 from racciari/master
libstdc++5: Fix build failure on missing libc-ldflags-before
2 parents ed814a4 + 0017d42 commit 8502512

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • pkgs/development/libraries/gcc/libstdc++

pkgs/development/libraries/gcc/libstdc++/5.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
6464
# being generated to make sure that they use our glibc.
6565
EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-crt1-cflags) $(cat $NIX_CC/nix-support/libc-cflags) -O2"
6666
67-
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before)"
67+
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags || true) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before || true)"
6868
for i in $extraLDFlags; do
6969
EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i"
7070
done

0 commit comments

Comments
 (0)