public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE"

Browse Source 
This reverts commit fd81a2ecb6b85594dc79ad53566c822849d4e47a.
Moved from master to staging.
This commit is contained in:
Vladimír Čunát 2018-07-31 09:48:16 +02:00
parent defa446bf2
commit 73959b68c2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View File

@ -126,7 +126,7 @@ fi
if [[ "$isCpp" = 1 ]]; then
if [[ "$cppInclude" = 1 ]]; then
NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE:-@default_cxx_stdlib_compile@}"
fi
NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK"
fi