b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge #191724: cc-wrapper: remove duplicate include flags

Browse source 
...into staging
This commit is contained in:
Vladimír Čunát 2022-10-05 20:01:34 +02:00
parent 855f2990f1 0bea4a194f
commit 4f6e99870b
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/setup-hook.sh
View file

@ -69,10 +69,12 @@ ccWrapper_addCVars () {
getHostRoleEnvHook
if [ -d "$1/include" ]; then
(! echo "$NIX_CFLAGS_COMPILE" | grep -q -F "$1/include") &&
export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include"
fi
if [ -d "$1/Library/Frameworks" ]; then
(! echo "$NIX_CFLAGS_COMPILE" | grep -q -F "$1/Library/Frameworks") &&
export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks"
fi
}