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.

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

xcbuild: add support for exporting sdk info #85844

Conversation

@virusdave
Copy link
Contributor

virusdave commented Apr 23, 2020

"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.
@virusdave
Copy link
Contributor Author

virusdave commented Apr 29, 2020

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

@worldofpeace
Copy link
Member

worldofpeace commented Apr 29, 2020

@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?

"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 virusdave:dnicponski/scratch/better_sdk_version_support branch from 1d2d6e1 to c3c3f68 Apr 29, 2020
@virusdave virusdave changed the base branch from master to staging Apr 29, 2020
@virusdave
Copy link
Contributor Author

virusdave commented Apr 29, 2020

@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 ?

@worldofpeace worldofpeace merged commit 317702e into NixOS:staging Apr 29, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c3c3f68"; rev="c3c3f68020af668e0c9ce3c93077e5f1fcafc87b"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c3c3f68"; rev="c3c3f68020af668e0c9ce3c93077e5f1fcafc87b"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c3c3f68"; rev="c3c3f68020af668e0c9ce3c93077e5f1fcafc87b"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c3c3f68"; rev="c3c3f68020af668e0c9ce3c93077e5f1fcafc87b"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c3c3f68"; rev="c3c3f68020af668e0c9ce3c93077e5f1fcafc87b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c3c3f68"; rev="c3c3f68020af668e0c9ce3c93077e5f1fcafc87b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="c3c3f68"; rev="c3c3f68020af668e0c9ce3c93077e5f1fcafc87b"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
xcbuild, xcbuild.passthru.tests on aarch64-linux Success
Details
xcbuild, xcbuild.passthru.tests on x86_64-linux Success
Details
@worldofpeace
Copy link
Member

worldofpeace commented Apr 29, 2020

Thanks for this

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

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.