diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-10-05 20:01:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-10-05 20:01:34 +0200 |
| commit | 4f6e99870b6f051a6701a8390199f3d4ad05ccfd (patch) | |
| tree | 9c61f025a2129bb3ebf25f810d7060e3ab2b3708 /pkgs/build-support | |
| parent | 855f2990f18fda882137dcc9dd4b917db05a8a08 (diff) | |
| parent | 0bea4a194f7103fcedc0226a74e50657875a7c4d (diff) | |
Merge #191724: cc-wrapper: remove duplicate include flags
...into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 6a913cc4eac72..94ca721cd914c 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -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 } |