public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17794 from abbradar/nostdinc

Browse Source 
cc-wrapper: handle -nostdinc{++,}
This commit is contained in:
Daniel Peebles 2016-08-19 16:35:35 -04:00 committed by GitHub
commit 57e6f19cad
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View File

@ -22,6 +22,7 @@ dontLink=0
getVersion=0 getVersion=0
nonFlagArgs=0 nonFlagArgs=0
[[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0
cppInclude=1
params=("$@") params=("$@")
n=0 n=0
@ -46,6 +47,10 @@ while [ $n -lt ${#params[*]} ]; do
isCpp=1 isCpp=1
elif [ "$p" = -nostdlib ]; then elif [ "$p" = -nostdlib ]; then
isCpp=-1 isCpp=-1
elif [ "$p" = -nostdinc ]; then
cppInclude=0
elif [ "$p" = -nostdinc++ ]; then
cppInclude=0
elif [ "${p:0:1}" != - ]; then elif [ "${p:0:1}" != - ]; then
nonFlagArgs=1 nonFlagArgs=1
elif [ "$p" = -m32 ]; then elif [ "$p" = -m32 ]; then
@ -106,7 +111,9 @@ if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then
fi fi
if [[ "$isCpp" = 1 ]]; then if [[ "$isCpp" = 1 ]]; then
if [[ "$cppInclude" = 1 ]]; then
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
fi
NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK"
fi fi