diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-05-02 14:00:37 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-05-02 14:00:37 -0400 |
| commit | 96bbe339d47d4bc78cc9eaf0845734f80fe2d56b (patch) | |
| tree | e01b3eefcc541685263122c73fbabdff2a233709 /pkgs/build-support/cc-wrapper/cc-wrapper.sh | |
| parent | 29271ef915bc7d62a208f3160d204d9dd99b5d1d (diff) | |
| download | nixpkgs-96bbe339d47d4bc78cc9eaf0845734f80fe2d56b.tar nixpkgs-96bbe339d47d4bc78cc9eaf0845734f80fe2d56b.tar.gz nixpkgs-96bbe339d47d4bc78cc9eaf0845734f80fe2d56b.tar.bz2 nixpkgs-96bbe339d47d4bc78cc9eaf0845734f80fe2d56b.tar.lz nixpkgs-96bbe339d47d4bc78cc9eaf0845734f80fe2d56b.tar.xz nixpkgs-96bbe339d47d4bc78cc9eaf0845734f80fe2d56b.tar.zst nixpkgs-96bbe339d47d4bc78cc9eaf0845734f80fe2d56b.zip | |
Revert "cc-wrapper: -nostdlib does not imply -nostdinc++"
This made C++ standard headers passed to be passed when C compiler is executed, which is not a correct fix. This reverts commit 54c7a0f42287f63c2db8086a8ad46ac981364378.
Diffstat (limited to 'pkgs/build-support/cc-wrapper/cc-wrapper.sh')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index b402893100b..d08fd24cd2d 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -132,13 +132,12 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then fi if [[ "$isCpp" = 1 ]]; then + if [[ "$cppInclude" = 1 ]]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" + fi NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" fi -if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" -fi - source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. |