Skip to content

xcbuild: add support for exporting sdk info #85844

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
Merged
merged 1 commit into from
Apr 29, 2020
Merged

xcbuild: add support for exporting sdk info #85844

merged 1 commit into from
Apr 29, 2020
+4 −0

Conversation

virusdave
Copy link
Contributor

"Real" xcodebuild allows using xcodebuild -version -sdk without
an sdk version argument, which will dump sdk info for all the
installed sdks.

Bazel"s "xcode cc toolchain setup on mac" process uses this
to determine which SDK version is actually installed. This
change allows using a nix-supplied pinned compiler and build
system under bazel.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@virusdave virusdave requested a review from matthewbauer as a code owner April 23, 2020 04:48
@virusdave
Copy link
Contributor Author

@worldofpeace Can you merge this, or let me know what i should be doing to move this forward? Thanks!

@worldofpeace
Copy link
Contributor

@virusdave Hi, I would merge this solely off the fact @matthewbauer approves, but I'm wondering if we want a mass rebuild on darwin for master where it isn't critical. I'm suspecting not, so could you rebase onto staging?

@virusdave
xcbuild: add compatibility support for exporting sdk info
c3c3f68 
"Real" xcodebuild allows using `xcodebuild -version -sdk` without
an sdk version argument, which will dump sdk info for all the
installed sdks.

Bazel"s "xcode cc toolchain setup on mac" process uses this
to determine which SDK version is actually installed.  This
change allows using a nix-supplied pinned compiler and build
system under bazel.
@virusdave virusdave force-pushed the dnicponski/scratch/better_sdk_version_support branch from 1d2d6e1 to c3c3f68 Compare April 29, 2020 02:50
@virusdave virusdave changed the base branch from master to staging April 29, 2020 02:50
@virusdave
Copy link
Contributor Author

@virusdave Hi, I would merge this solely off the fact @matthewbauer approves, but I'm wondering if we want a mass rebuild on darwin for master where it isn't critical. I'm suspecting not, so could you rebase onto staging?

Sure, done!

For my benefit, what's the difference between master and staging ?

@ofborg ofborg bot added 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: stdenv Standard environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild and removed 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: stdenv Standard environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 29, 2020
@worldofpeace
Copy link
Contributor

@virusdave See https://nixos.org/nixpkgs/manual/#submitting-changes-staging-branch https://nixos.org/nixpkgs/manual/#submitting-changes-staging-next-branch

@worldofpeace worldofpeace merged commit 317702e into NixOS:staging Apr 29, 2020
@worldofpeace
Copy link
Contributor

Thanks for this ✨

@virusdave virusdave deleted the dnicponski/scratch/better_sdk_version_support branch May 1, 2020 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer

@Ericson2314 Ericson2314

@FRidh FRidh

@jonringer jonringer

Assignees
No one assigned
Labels
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+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@virusdave @worldofpeace @matthewbauer