Skip to content

Revert "llvmPackages_11: Add $rsrc/lib to default cflags"#200587

Merged
Ericson2314 merged 1 commit intoNixOS:staging-nextfrom
alyssais:revert-rsrc
Nov 10, 2022
Merged

Revert "llvmPackages_11: Add $rsrc/lib to default cflags"#200587
Ericson2314 merged 1 commit intoNixOS:staging-nextfrom
alyssais:revert-rsrc

Conversation

@alyssais
Copy link
Copy Markdown
Member

@alyssais alyssais commented Nov 10, 2022

Description of changes

This reverts commit 2000ae5.

This was intended as a fix for i686 cross compilation, but it has had other unforeseen consequences, such as breaking rust-bindgen.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@alyssais
Revert "llvmPackages_11: Add $rsrc/lib to default cflags"
c3f3bad 
This reverts commit 2000ae5.

This was intended as a fix for i686 cross compilation, but it has had
other unforeseen consequences, such as breaking rust-bindgen.
@alyssais alyssais mentioned this pull request Nov 10, 2022
Merged
13 tasks
@Ericson2314
Copy link
Copy Markdown
Member

Ericson2314 commented Nov 10, 2022

Agreed

@Ericson2314 Ericson2314 merged commit 9637cc5 into NixOS:staging-next Nov 10, 2022
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Nov 10, 2022
@ofborg ofborg bot requested review from dtzWill, lovek323 and primeos November 10, 2022 21:08
@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: 5001+ This PR causes many rebuilds on Darwin and must 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 10, 2022
@alyssais alyssais deleted the revert-rsrc branch November 11, 2022 09:24
This was referenced Nov 11, 2022
Open
Merged
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@dtzWill dtzWill Awaiting requested review from dtzWill

@lovek323 lovek323 Awaiting requested review from lovek323

@primeos primeos Awaiting requested review from primeos

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@alyssais @Ericson2314 @rrbutani