diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-16 11:40:31 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-17 13:19:46 +0300 |
| commit | 24f695ffaa27dc45d578fd75351991eb8de05902 (patch) | |
| tree | 29c04d5cb0609ac97c09b35dac1e6cf530c2eafb /pkgs/build-support/cc-wrapper | |
| parent | 081ac25dc67183443a1c25a473090b491aff703f (diff) | |
| download | nixlib-24f695ffaa27dc45d578fd75351991eb8de05902.tar nixlib-24f695ffaa27dc45d578fd75351991eb8de05902.tar.gz nixlib-24f695ffaa27dc45d578fd75351991eb8de05902.tar.bz2 nixlib-24f695ffaa27dc45d578fd75351991eb8de05902.tar.lz nixlib-24f695ffaa27dc45d578fd75351991eb8de05902.tar.xz nixlib-24f695ffaa27dc45d578fd75351991eb8de05902.tar.zst nixlib-24f695ffaa27dc45d578fd75351991eb8de05902.zip | |
cc-wrapper: handle -nostdinc{++,}
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 894ea95b5fa0..024a1866daca 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 @@ -106,7 +111,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 |