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

rustc: bump runtime LLVM to match upstream #71430

Merged
merged 1 commit into from Nov 12, 2019
Merged

Conversation

lblasc
Copy link
Contributor

@lblasc lblasc commented Oct 20, 2019

Motivation for this change

Bumps rustc llvm to version 9 to match upstream. Check: https://github.com/rust-lang/rust/blob/stable/.gitmodules#L43

Rustc supports multiple versions of LLVM and using nixpkgs default one (currently LLVM 7) works fine. I'm suggesting to follow upstream version as much as we can to eliminate potential bugs (leveraging fixes included in releases) also bringing latest LLVM optimizations.

I've did quick test with fd package and internal rust project. Didn't found any problems.

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.
Notify maintainers

cc @edolstra

```
rustc 1.38.0
binary: rustc
commit-hash: unknown
commit-date: unknown
host: x86_64-unknown-linux-gnu
release: 1.38.0
LLVM version: 9.0
```
@@ -1,6 +1,6 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2
, llvm_7, darwin, git, cmake, rustPlatform
, llvm_9, darwin, git, cmake, rustPlatform
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can switch to llvmPackages_latest.llvm instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it will be better to stick with version 9 and bump when rust upstream switches to newer version. I don't have strong opinion on this one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case please leave a note in rustc for maintainers to also check for the used llvm version when updating rustc.

@Mic92
Copy link
Member

Mic92 commented Oct 21, 2019

@GrahamcOfBorg build rustc

@Mic92
Copy link
Member

Mic92 commented Oct 21, 2019

@GrahamcOfBorg build fd

@FRidh FRidh added this to Needs review in Staging Oct 27, 2019
@FRidh FRidh merged commit 8bff104 into NixOS:staging Nov 12, 2019
Staging automation moved this from Needs review to Done Nov 12, 2019
@lblasc lblasc deleted the rustLLVM9 branch November 12, 2019 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants