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

Jump to bottom

llvm/compiler-rt: fix on i686 #69908

Merged
merged 3 commits into from Oct 1, 2019
Merged

llvm/compiler-rt: fix on i686 #69908

merged 3 commits into from Oct 1, 2019

Conversation

matthewbauer
Copy link
Member

Only turn on cross related flags when useLLVM = true.

Fixes #66693

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

cc @

@arcnmx
Copy link
Member

arcnmx commented Sep 30, 2019 •
edited

Given that #69115 just landed this probably needs to be applied to llvmPackages_9 as well?

@matthewbauer
llvm/compiler-rt: fix on i686
d303a2f 
Only turn on cross related flags when useLLVM = true.

Fixes NixOS#66693
@matthewbauer
llvm/compiler: preserve hashes
a7dc5c6 
Don’t require a mass rebuild for this fix.
@matthewbauer
llvm9/compiler-rt: fix on i686
1f95c9c
@matthewbauer matthewbauer merged commit 0ce8688 into NixOS:master Oct 1, 2019
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Oct 1, 2019
@matthewbauer @dtzWill
Merge pull request NixOS#69908 from matthewbauer/fix-clang-i686
a891e5d 
llvm/compiler-rt: fix on i686

(cherry picked from commit 0ce8688)
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
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@matthewbauer @arcnmx