Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1b334b86209e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a81eee254c67
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 25, 2019

  1. cmake: process -iframework in setup-hook 

    This fixes a regression in #26197

Fixes: f496357 ('cc-wrapper: use -iframework instead of -F')
(cherry picked from commit c8041d9)

cc #70997
    @veprbl
    veprbl committed Oct 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a81eee2 View commit details
Showing with 8 additions and 0 deletions.
  1. +8 −0 pkgs/development/tools/build-managers/cmake/setup-hook.sh
8 changes: 8 additions & 0 deletions pkgs/development/tools/build-managers/cmake/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -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