Skip to content

llvmPackages: remove _IMPORT_PREFIX replacements for clang#366029

Merged
philiptaron merged 1 commit intoNixOS:stagingfrom
philiptaron:fix-pr-356120-replacement
Dec 18, 2024
Merged

llvmPackages: remove _IMPORT_PREFIX replacements for clang#366029
philiptaron merged 1 commit intoNixOS:stagingfrom
philiptaron:fix-pr-356120-replacement

Conversation

@philiptaron
Copy link
Contributor

@philiptaron philiptaron commented Dec 18, 2024

These strings do not show up in the files where they are attempting to be replaced.

This fixes the build for clang_15, clang_16, clang_17, clang_18, and clang_19. The remaining three (clang_12, clang_13, and clang_14) are broken due to llvmPackages_12.tblgen, llvmPackages_13.tblgen, and llvmPackages_14.tblgen errors.

Resolves the issue that @trofi found in #356120.

CC @pwaller

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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
  • Fits CONTRIBUTING.md.

These strings do not show up in the files where they are attempting to be replaced.
@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Dec 18, 2024
@philiptaron
Copy link
Contributor Author

philiptaron commented Dec 18, 2024

llvmPackages_12.tblgen, llvmPackages_13.tblgen, and llvmPackages_14.tblgen fail with another error before ever getting to this spot:

CMake Error: cannot write to file "/build/llvm-tblgen-src-12.0.1/llvm/build/lib/cmake/mlir/MLIRTargets.cmake": Permission denied

This PR doesn't introduce that error, but it doesn't fix it either.

Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looked at clang-{12,17,18} and the change LGTM

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 18, 2024
@philiptaron philiptaron merged commit ae07966 into NixOS:staging Dec 18, 2024
@philiptaron philiptaron deleted the fix-pr-356120-replacement branch December 18, 2024 03:15
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 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants