diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-27 23:52:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-27 23:52:05 +0200 |
| commit | 850251213a9df6a2f645de43e7e9b4cc6f376cf6 (patch) | |
| tree | 2df1a65381df8ae76f3042c3ec2d6aab019a5534 /pkgs | |
| parent | ed814a4586e9d84fe3d209ebaf109cce3938154e (diff) | |
| parent | 0017d42f1edeb6b58ea4d0448664156300bc7ebd (diff) | |
| download | nixpkgs-850251213a9df6a2f645de43e7e9b4cc6f376cf6.tar nixpkgs-850251213a9df6a2f645de43e7e9b4cc6f376cf6.tar.gz nixpkgs-850251213a9df6a2f645de43e7e9b4cc6f376cf6.tar.bz2 nixpkgs-850251213a9df6a2f645de43e7e9b4cc6f376cf6.tar.lz nixpkgs-850251213a9df6a2f645de43e7e9b4cc6f376cf6.tar.xz nixpkgs-850251213a9df6a2f645de43e7e9b4cc6f376cf6.tar.zst nixpkgs-850251213a9df6a2f645de43e7e9b4cc6f376cf6.zip | |
Merge pull request #142859 from racciari/master
libstdc++5: Fix build failure on missing libc-ldflags-before
Diffstat (limited to 'pkgs')
| -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 f963ae31e5c..41c22da67b3 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 |