Skip to content

mesa: Fix build#121335

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
Ericson2314:fix-mesa
May 1, 2021
Merged

mesa: Fix build#121335
Ericson2314 merged 1 commit intoNixOS:stagingfrom
Ericson2314:fix-mesa

Conversation

@Ericson2314
Copy link
Copy Markdown
Member

@Ericson2314 Ericson2314 commented Apr 30, 2021

Motivation for this change

Needed more LLVM outputs after #111487.

CC @jonringer this is the sort of breakage and fix I suspect.

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.

@Ericson2314
mesa: Fix build
96f700f 
Needed more LLVM outputs
@ofborg ofborg bot requested review from primeos and vcunat April 30, 2021 22:20
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 30, 2021
@jonringer
Copy link
Copy Markdown
Contributor

jonringer commented Apr 30, 2021 •
edited
Loading

related to #111487, but not directly to this PR, rustc is broken on x86

builder for '/nix/store/sq7qf5yms654xir0dibrispgfv8p41vz-rustc-1.51.0.drv' failed with exit code 2; last 10 log lines:
      Finished dev [unoptimized + debuginfo] target(s) in 53.55s


  failed to execute command: "/nix/store/fhzrajri2q7c2nifww7wvksisqqkpmzb-llvm-11.1.0/bin/llvm-config" "--bindir"
  error: No such file or directory (os error 2)


  failed to run: /build/rustc-1.51.0-src/build/bootstrap/debug/bootstrap build --stage 2 --jobs 32
  Build completed unsuccessfully in 0:00:53
  make: *** [Makefile:12: all] Error 1

@Ericson2314 Ericson2314 merged commit 4b499cf into NixOS:staging May 1, 2021
@Ericson2314 Ericson2314 deleted the fix-mesa branch May 1, 2021 01:06
@Ericson2314
Copy link
Copy Markdown
Member Author

Ericson2314 commented May 1, 2021

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@primeos primeos Awaiting requested review from primeos

@vcunat vcunat Awaiting requested review from vcunat

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Ericson2314 @jonringer