diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-07-03 17:11:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 17:11:11 -0400 |
| commit | 6c4ed49ed83007ddc8edc4563bb2a792c9395a6d (patch) | |
| tree | 926960152aaf5db3c18cf54f9697ded503294905 /pkgs/build-support | |
| parent | 10f3980f9534d96d32f026547f2a1d9a5aa8e468 (diff) | |
| parent | f496357585d6110d97cb55ad699a09ca003ed82b (diff) | |
| download | nixlib-6c4ed49ed83007ddc8edc4563bb2a792c9395a6d.tar nixlib-6c4ed49ed83007ddc8edc4563bb2a792c9395a6d.tar.gz nixlib-6c4ed49ed83007ddc8edc4563bb2a792c9395a6d.tar.bz2 nixlib-6c4ed49ed83007ddc8edc4563bb2a792c9395a6d.tar.lz nixlib-6c4ed49ed83007ddc8edc4563bb2a792c9395a6d.tar.xz nixlib-6c4ed49ed83007ddc8edc4563bb2a792c9395a6d.tar.zst nixlib-6c4ed49ed83007ddc8edc4563bb2a792c9395a6d.zip | |
Merge pull request #63904 from matthewbauer/iframeworkdir
cc-wrapper: use -iframework instead of -F
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 8 |
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 } |