Skip to content

[staging] llvmPackages_*.clang: stop passing LLVM_CONFIG_PATH unnecessarily#153340

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
sternenseemann:clang-no-llvm-config
Jan 4, 2022
Merged

[staging] llvmPackages_*.clang: stop passing LLVM_CONFIG_PATH unnecessarily#153340
Ericson2314 merged 1 commit intoNixOS:stagingfrom
sternenseemann:clang-no-llvm-config

Conversation

@sternenseemann
Copy link
Member

Starting with LLVM 8, clang does no longer use llvm-config to detect the
LLVM installation: llvm/llvm-project@e4faa5c7986b7
Consequently, there is no point passing LLVM_CONFIG_PATH (in fact the
variable is unused currently).

Motivation for this change
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.05 Release Notes (or backporting 21.11 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.

@sternenseemann
Copy link
Member Author

@ofborg build llvmPackages_8.clang-unwrapped

@sternenseemann
Copy link
Member Author

@ofborg build llvmPackages_13.clang-unwrapped

@sternenseemann
Copy link
Member Author

@ofborg build llvmPackages_11.clang-unwrapped

@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Jan 3, 2022
@ofborg ofborg bot requested review from 7c6f434c, dtzWill, lovek323 and primeos January 3, 2022 15:10
@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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 3, 2022
Starting with LLVM 8, clang does no longer use llvm-config to detect the
LLVM installation: llvm/llvm-project@e4faa5c7986b7
Consequently, there is no point passing LLVM_CONFIG_PATH (in fact the
variable is unused currently).
@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Jan 3, 2022
@sternenseemann sternenseemann changed the title llvmPackages_*.clang: stop passing LLVM_CONFIG_PATH unnecessarily [staging] llvmPackages_*.clang: stop passing LLVM_CONFIG_PATH unnecessarily Jan 3, 2022
@ofborg ofborg bot requested a review from lovek323 January 3, 2022 16:44
@Mindavi
Copy link
Contributor

Mindavi commented Jan 3, 2022

Isn't this needed for mesa cross-compilation?

Edit: oh, it's only for clang. Then I guess it isn't needed.

@Ericson2314 Ericson2314 merged commit 8a8791e into NixOS:staging Jan 4, 2022
@sternenseemann sternenseemann deleted the clang-no-llvm-config branch January 4, 2022 01:27
@Ericson2314
Copy link
Member

Horry to one less annoying config tool!

@github-actions
Copy link
Contributor

github-actions bot commented Jan 7, 2022

Backport failed for staging-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-153340-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-153340-to-staging-21.11
git checkout -b backport-153340-to-staging-21.11
ancref=$(git merge-base c6f7ec4c2a6b2910f53d083fd2a8d191d72758ac c58517aeed3ee840a0d92455e4f4231f2396d73f)
git cherry-pick -x $ancref..c58517aeed3ee840a0d92455e4f4231f2396d73f

@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

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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Comments