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

rls: fix darwin build #63759

Merged
merged 2 commits into from
Jul 29, 2019
Merged

rls: fix darwin build #63759

merged 2 commits into from
Jul 29, 2019

Conversation

arcnmx
Copy link
Member

@arcnmx arcnmx commented Jun 25, 2019

Motivation for this change

Fixes broken darwin builds.

caveat: I'm not really sure why -C rpath isn't needed on Linux, rustlib/ is just magically getting added to rpath on linux but not on darwin?

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Jun 25, 2019
@arcnmx arcnmx force-pushed the rust-darwin-rls branch 2 times, most recently from ce3dddf to 941251e Compare July 28, 2019 06:59
@arcnmx
Copy link
Member Author

arcnmx commented Jul 28, 2019

#65241 updated rls and included a partial darwin fix, but doesn't seem to be enough to actually get it to run so this PR is still relevant. I've added a quick installCheck to help catch this. Could someone ask ofborg to try building this on darwin?

rls is also currently broken on all platforms so this updates it (did we just go from rustc 1.34 -> 1.35 -> 1.36 in the span of a week?)

cc @symphorien and @dywedir

@ofborg ofborg bot added 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Jul 28, 2019
@arcnmx arcnmx mentioned this pull request Jul 28, 2019
Closed
10 tasks
@arcnmx
rls: fix darwin build
40020f4 
rls links to internal rustc crates, which introduces an atypical
dependency on rustc. A superficial installCheck ensures that the
binary is linked properly and able to run on its own.
@grahamc
Copy link
Member

grahamc commented Jul 28, 2019

@GrahamcOfBorg build rls

@Mic92 Mic92 merged commit 6943c9e into NixOS:master Jul 29, 2019
@dywedir
Copy link
Member

dywedir commented Jul 29, 2019

@arcnmx thanks!
Sorry, I didn't see your PR at the time.

@arcnmx arcnmx deleted the rust-darwin-rls branch July 29, 2019 23:55
@matthias-t matthias-t mentioned this pull request Aug 5, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@arcnmx @grahamc @dywedir @Mic92