From 73959b68c25a70599adaace31154b65c82618aa9 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 31 Jul 2018 09:48:16 +0200 Subject: Re-Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE" This reverts commit fd81a2ecb6b85594dc79ad53566c822849d4e47a. Moved from master to staging. --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/build-support/cc-wrapper/cc-wrapper.sh') 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 -- cgit 1.4.1