nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-16 00:17:57 +00:00
Code Issues 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
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 getHostRoleEnvHook
if [ -d "$1/include" ]; then if [ -d "$1/include" ]; then
(! echo "$NIX_CFLAGS_COMPILE" | grep -q -F "$1/include") &&
export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include" export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include"
fi fi
if [ -d "$1/Library/Frameworks" ]; then 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" export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks"
fi fi
} }