about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-06-28 16:25:57 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-06-28 16:27:27 -0400
commitf496357585d6110d97cb55ad699a09ca003ed82b (patch)
tree2c23c426aa336ecc2521333a836a788666b98833 /pkgs/build-support
parenta33837391a0031de949311e18a3ccda370f99c0c (diff)
downloadnixlib-f496357585d6110d97cb55ad699a09ca003ed82b.tar
nixlib-f496357585d6110d97cb55ad699a09ca003ed82b.tar.gz
nixlib-f496357585d6110d97cb55ad699a09ca003ed82b.tar.bz2
nixlib-f496357585d6110d97cb55ad699a09ca003ed82b.tar.lz
nixlib-f496357585d6110d97cb55ad699a09ca003ed82b.tar.xz
nixlib-f496357585d6110d97cb55ad699a09ca003ed82b.tar.zst
nixlib-f496357585d6110d97cb55ad699a09ca003ed82b.zip
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.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/cc-wrapper/setup-hook.sh8
1 files changed, 4 insertions, 4 deletions
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
 }