diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-24 11:01:53 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-24 11:01:53 +0200 |
| commit | c0fa26ef3b894eb1373da54747b056c0d57083c1 (patch) | |
| tree | 5e9146732b0f086abc7d766932e378fafb983246 /pkgs/build-support/cc-wrapper | |
| parent | 8576aea57c1d23d7f65bf3b4f1cace2d656a960a (diff) | |
| parent | 76223aa4b2cc7ebda27a93f00829bd447701740a (diff) | |
| download | nixlib-c0fa26ef3b894eb1373da54747b056c0d57083c1.tar nixlib-c0fa26ef3b894eb1373da54747b056c0d57083c1.tar.gz nixlib-c0fa26ef3b894eb1373da54747b056c0d57083c1.tar.bz2 nixlib-c0fa26ef3b894eb1373da54747b056c0d57083c1.tar.lz nixlib-c0fa26ef3b894eb1373da54747b056c0d57083c1.tar.xz nixlib-c0fa26ef3b894eb1373da54747b056c0d57083c1.tar.zst nixlib-c0fa26ef3b894eb1373da54747b056c0d57083c1.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 688dd7be1c6f..03f068d8298e 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -22,6 +22,7 @@ dontLink=0 getVersion=0 nonFlagArgs=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 +cppInclude=1 params=("$@") n=0 @@ -46,6 +47,10 @@ while [ $n -lt ${#params[*]} ]; do isCpp=1 elif [ "$p" = -nostdlib ]; then isCpp=-1 + elif [ "$p" = -nostdinc ]; then + cppInclude=0 + elif [ "$p" = -nostdinc++ ]; then + cppInclude=0 elif [ "${p:0:1}" != - ]; then nonFlagArgs=1 elif [ "$p" = -m32 ]; then @@ -105,7 +110,9 @@ if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then fi if [[ "$isCpp" = 1 ]]; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + if [[ "$cppInclude" = 1 ]]; then + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + fi NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" fi |