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

llvmPackages_11.compiler-rt: enable support for i486 i586 i686 #100587

Merged
merged 1 commit into from Oct 16, 2020
Merged

llvmPackages_11.compiler-rt: enable support for i486 i586 i686 #100587

merged 1 commit into from Oct 16, 2020

Conversation

DieGoldeneEnte
Copy link
Contributor

Motivation for this change

compiler-rt (and as a result clang) can't be build for i686 (as noticed here: #99984).
The patch adds the required variables and should result in the same behavior as in the nixpkgs-llvm10. It essentially forces to use i386 buildins when using i486, i586 or i686, which are not supported.

Fixes #100392

Things done
  • tested build for i686 and x86_64 locally.
  • 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.

@DieGoldeneEnte DieGoldeneEnte mentioned this pull request Oct 15, 2020
Closed
@primeos
Copy link
Member

primeos commented Oct 16, 2020

@GrahamcOfBorg build pkgsi686Linux.clang_11

primeos
primeos approved these changes Oct 16, 2020
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Let's give this a try, thanks!

(Upstream commit that removed i686_SOURCES: llvm/llvm-project@8cbb6cc)

@primeos primeos merged commit 6948875 into NixOS:master Oct 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@primeos primeos primeos approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@DieGoldeneEnte @primeos