Unverified Commit 85025121 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #142859 from racciari/master 

libstdc++5: Fix build failure on missing libc-ldflags-before
parents ed814a45 0017d42f

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

+1 −1
Original line number Diff line number Diff line
@@ -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