rubyPackages.iconv, v8: fix build with clang 16 #265307
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix incompatible function pointer conversion errors.
reckenrode
changed the title
|
Setting to draft while I troubleshoot an issue I encountered while doing a rebuild. |
|
Marking ready after successfully rebuilding locally. |
wegank
reviewed
Nov 4, 2023
This was taken from NixOS#264091 to use in the interim before that PR lands (sometime after the release of 23.11). It allows different versions of clang to link the same libc++, allowing dependencies to be linked when they are built with a different version of clang than the stdenv.
The version of v8 in nixpkgs fails to build due to `-Wenum-constexpr-conversion` errors. Since this will be made a hard error in later versions of clang, use clang 15 to build v8.
reckenrode
force-pushed
the
clang16-fixes-batch2
branch
from
18b192d to
2c4e2d8
Compare
|
@wegank I added the adapter and updated the PR to use it. |
wegank
approved these changes
Nov 4, 2023
delroth
added
the
12.approvals: 1
trofi
reviewed
Jan 7, 2024
| in | ||
| overrideCC stdenv (stdenv.cc.override { | ||
| inherit libcxx; | ||
| extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ]; |
There was a problem hiding this comment.
Does pkgs.pkgsTargetTarget work for you for any cross-cases? I tried pkgsLLVM.asciidoc-full and it fails the eval as:
nix build --no-link -f. pkgsLLVM.asciidoc-full
error:
error: attribute 'llvmPackages_13' missing
at pkgs/stdenv/adapters.nix:86:32:
85| inherit libcxx;
86| extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ];
| ^
87| });
It looks like pkgsTargetTarget is always empty for cross-compilers. On the contrast the following seems to work:
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -83,7 +83,10 @@ rec {
in
overrideCC stdenv (stdenv.cc.override {
inherit libcxx;
- extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ];
+ extraPackages = [
+ cxxabi
+ pkgs.buildPackages.targetPackages."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt
+ ];
});
# Override the setup script of stdenv. Useful for testing newThere was a problem hiding this comment.
Proposed the change as #279463
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Second batch of fixes for staging-next #263535.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)