From f496357585d6110d97cb55ad699a09ca003ed82b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Jun 2019 16:25:57 -0400 Subject: cc-wrapper: use -iframework instead of -F This avoids dumping -Wall warnings when they appear in framework headers. As a result, we are closer to how regular headers are included (via -isystem). Also remove ccIncludeFlag lookup, this was unused & not very useful. --- pkgs/build-support/cc-wrapper/setup-hook.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 28060de74118..211b50632914 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -70,12 +70,12 @@ ccWrapper_addCVars () { local role_post role_pre getHostRoleEnvHook - if [[ -d "$1/include" ]]; then - export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" + if [ -d "$1/include" ]; then + export NIX_${role_pre}CFLAGS_COMPILE+=" -isystem $1/include" fi - if [[ -d "$1/Library/Frameworks" ]]; then - export NIX_${role_pre}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" + if [ -d "$1/Library/Frameworks" ]; then + export NIX_${role_pre}CFLAGS_COMPILE+=" -iframework $1/Library/Frameworks" fi } -- cgit 1.4.1