diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-07-01 21:55:06 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:27:32 +0000 |
commit | a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58 (patch) | |
tree | fd595a79aef4e2890cb85349e510d83c8d9b37ed /nixpkgs/pkgs/development/libraries/gcc | |
parent | 9813779f5440de04f3074b388c02334faaeb0b94 (diff) | |
download | nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.gz nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.bz2 nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.lz nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.xz nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.tar.zst nixlib-a8f71ebd898b2dcbd4c66d7a7bc7e6e5df563f58.zip |
stdenv: make -nostdinc work as intended
Right now we add glibc to search path also -nostdinc was provided, which breaks projects providing their own gcc. (cherry picked from commit 96092dc93640b8ad6520a8bae6f78d62eaba0ec2)
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gcc')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix index 2a11d835a6b5..486a24defd1b 100644 --- a/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" + 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)" for i in $extraLDFlags; do |