diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-31 09:48:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-31 09:48:16 +0200 |
| commit | 73959b68c25a70599adaace31154b65c82618aa9 (patch) | |
| tree | 432ac23e1c27e14c8359193a29f49a29fd1c416b /pkgs/build-support/cc-wrapper | |
| parent | defa446bf2e146044259090368c04c000c2f473b (diff) | |
| download | nixlib-73959b68c25a70599adaace31154b65c82618aa9.tar nixlib-73959b68c25a70599adaace31154b65c82618aa9.tar.gz nixlib-73959b68c25a70599adaace31154b65c82618aa9.tar.bz2 nixlib-73959b68c25a70599adaace31154b65c82618aa9.tar.lz nixlib-73959b68c25a70599adaace31154b65c82618aa9.tar.xz nixlib-73959b68c25a70599adaace31154b65c82618aa9.tar.zst nixlib-73959b68c25a70599adaace31154b65c82618aa9.zip | |
Re-Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE"
This reverts commit fd81a2ecb6b85594dc79ad53566c822849d4e47a. Moved from master to staging.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 1b43d7cc211a..8003fe1d8f38 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -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 |