diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
| commit | 74720a36c75ce74dbafb86a147aecbbdd0c1f6a7 (patch) | |
| tree | 19e0db68b876d7127d083c3733fe40c7016809ce /pkgs/development/compilers/gcc | |
| parent | c7b337385140762b16cb30c0442919a040182185 (diff) | |
| parent | 5d4d4df8c0899af2342bfbb4f5c898c2cd3241ce (diff) | |
| download | nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.gz nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.bz2 nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.lz nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.xz nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.zst nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/libstdc++-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 2d30c845b5a3..893bbbc0c2dc 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1,2 +1,2 @@ -export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" +export NIX_CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++" |