diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-31 09:43:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-31 09:43:52 +0200 |
| commit | fd81a2ecb6b85594dc79ad53566c822849d4e47a (patch) | |
| tree | 3c21ec78594de2c9575dcd86ddabcf454f65d936 /pkgs/build-support/cc-wrapper | |
| parent | 55b41a7e33112aeb7e0c7b453027a347f96ce874 (diff) | |
| download | nixlib-fd81a2ecb6b85594dc79ad53566c822849d4e47a.tar nixlib-fd81a2ecb6b85594dc79ad53566c822849d4e47a.tar.gz nixlib-fd81a2ecb6b85594dc79ad53566c822849d4e47a.tar.bz2 nixlib-fd81a2ecb6b85594dc79ad53566c822849d4e47a.tar.lz nixlib-fd81a2ecb6b85594dc79ad53566c822849d4e47a.tar.xz nixlib-fd81a2ecb6b85594dc79ad53566c822849d4e47a.tar.zst nixlib-fd81a2ecb6b85594dc79ad53566c822849d4e47a.zip | |
Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE"
This reverts commit 034c9816d5236e5c0131b715ee08fed56c89d4ad, reversing changes made to 5afe87ed7a75e99c3b68f255562dc82b3e3c7d4e. Huge rebuild, moving 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 8003fe1d8f38..1b43d7cc211a 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 |