diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-10-11 17:24:33 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-10-11 18:48:16 -0400 |
| commit | c8041d97a54ab743412952f7f8f558384877b819 (patch) | |
| tree | 022d7096fd5c780c7d1f19212f6b81bff8a09bf0 /pkgs/development/tools/build-managers | |
| parent | a7c52c451e541514fe324bec2916758c031d3af8 (diff) | |
| download | nixlib-c8041d97a54ab743412952f7f8f558384877b819.tar nixlib-c8041d97a54ab743412952f7f8f558384877b819.tar.gz nixlib-c8041d97a54ab743412952f7f8f558384877b819.tar.bz2 nixlib-c8041d97a54ab743412952f7f8f558384877b819.tar.lz nixlib-c8041d97a54ab743412952f7f8f558384877b819.tar.xz nixlib-c8041d97a54ab743412952f7f8f558384877b819.tar.zst nixlib-c8041d97a54ab743412952f7f8f558384877b819.zip | |
cmake: process -iframework in setup-hook
This fixes a regression in #26197
Fixes: f496357585 ('cc-wrapper: use -iframework instead of -F')
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 29fe6fd79de4..b8716c5251eb 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -124,12 +124,17 @@ addEnvHooks "$targetOffset" addCMakeParams makeCmakeFindLibs(){ isystem_seen= + iframework_seen= for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do if test -n "$isystem_seen" && test -d "$flag"; then isystem_seen= export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}" + elif test -n "$iframework_seen" && test -d "$flag"; then + iframework_seen= + export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag}" else isystem_seen= + iframework_seen= case $flag in -I*) export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}" @@ -143,6 +148,9 @@ makeCmakeFindLibs(){ -isystem) isystem_seen=1 ;; + -iframework) + iframework_seen=1 + ;; esac fi done |