Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmake: process -iframework in setup-hook #70997

Merged
merged 1 commit into from
Oct 13, 2019
Merged

cmake: process -iframework in setup-hook #70997

merged 1 commit into from
Oct 13, 2019
+8 −0

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Oct 11, 2019 •
edited
Loading

This fixes a regression in #26197

Fixes: f496357 ('cc-wrapper: use -iframework instead of -F')

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@veprbl veprbl requested a review from matthewbauer October 11, 2019 21:27
@veprbl veprbl added the 9.needs: port to stable A PR needs a backport to the stable release. label Oct 11, 2019
@matthewbauer
Copy link
Member

Yeah looks good! Totally forgot about the cmake setup-hook handling of this.

@veprbl
cmake: process -iframework in setup-hook

Verified

This commit was signed with the committer’s verified signature.
dimkl Dimitris Klouvas
GPG key ID: 0931F5B7A6BC310B
Verified
Learn about vigilant mode
c8041d9 
This fixes a regression in NixOS#26197

Fixes: f496357 ('cc-wrapper: use -iframework instead of -F')
@veprbl veprbl force-pushed the pr/cmake_iframework branch from 80705ac to c8041d9 Compare October 11, 2019 22:48
@veprbl veprbl added the 6.topic: darwin Running or building packages on Darwin label Oct 12, 2019
@veprbl veprbl merged commit 5d19c11 into NixOS:staging Oct 13, 2019
veprbl added a commit that referenced this pull request Oct 25, 2019
@veprbl
cmake: process -iframework in setup-hook

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
a81eee2 
This fixes a regression in #26197

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

cc #70997
@veprbl veprbl added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Oct 25, 2019
@veprbl veprbl deleted the pr/cmake_iframework branch December 1, 2020 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@veprbl @matthewbauer