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

compiler-rt: fix build on armv7l #87419

Merged
merged 2 commits into from May 11, 2020

Conversation

@thefloweringash
Copy link
Member

thefloweringash commented May 9, 2020

Motivation for this change

Fixes #87266 - llvmPackages_7.compiler-rt fails to produce output path on armv7l

Still testing the builds, so opening as draft.

See also same change for x86 #85945

cc @matthewbauer @Atemu @TravisWhitaker

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.
@matthewbauer
Copy link
Member

matthewbauer commented May 9, 2020

Nice work! We probably should consolidate this with set(X86 i386 i486 i586 i686) and try to get it accepted upstream.

@thefloweringash
Copy link
Member Author

thefloweringash commented May 9, 2020

Successfully built for llvmPackages_{5,6,7,8,9,10}.compiler-rt. For llvmPackages_{8,10} I had to set doCheck = false in llvm due to test failures.

We probably should consolidate this with set(X86 i386 i486 i586 i686) and try to get it accepted upstream.

I'm following the pattern in #85945 with enough changes to make it work. I didn't look deeply into why this is an appropriate fix. Someone else would need to write the cover letter for upstreaming.

Incidentally, has this been tested in the i486 and i586 cases? I only see a definition of i386_sources and i686_sources in the CMakeLists.txt. I wouldn't be surprised if it fails with the same error as in #87266 (comment) for i486 and i586

@Atemu
Copy link
Member

Atemu commented May 10, 2020

Hm, is it actually still causing a rebuild on Darwin or is ofBorg bugged?

@thefloweringash thefloweringash force-pushed the thefloweringash:compiler-rt-armv7l branch from 1a11cc7 to 1b0e7b1 May 10, 2020
No need for rebuilds on other platforms
@doronbehar
Copy link
Contributor

doronbehar commented May 10, 2020

Related: #87528

@matthewbauer matthewbauer merged commit 028d322 into NixOS:master May 11, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d616ae8"; rev="d616ae8c6de5294cbd7db2431325f6b5387a4262"; } ./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="d616ae8"; rev="d616ae8c6de5294cbd7db2431325f6b5387a4262"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d616ae8"; rev="d616ae8c6de5294cbd7db2431325f6b5387a4262"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d616ae8"; rev="d616ae8c6de5294cbd7db2431325f6b5387a4262"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d616ae8"; rev="d616ae8c6de5294cbd7db2431325f6b5387a4262"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d616ae8"; rev="d616ae8c6de5294cbd7db2431325f6b5387a4262"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d616ae8"; rev="d616ae8c6de5294cbd7db2431325f6b5387a4262"; } ./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
@thefloweringash thefloweringash deleted the thefloweringash:compiler-rt-armv7l branch May 11, 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.

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