Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clang_9: Correct ClangTargets-release.cmake #76669

Merged
merged 1 commit into from Jan 6, 2020
Merged

clang_9: Correct ClangTargets-release.cmake #76669

merged 1 commit into from Jan 6, 2020

Conversation

xbreak
Copy link
Contributor

@xbreak xbreak commented Dec 29, 2019

Motivation for this change

Since commit 4271020 libclang-cpp is also moved to $lib. This adds the missing
substitution in ClangTargets-release.cmake.

I noticed this when building ccls with clang 9:

nix-build -E 'with import <nixpkgs>{}; \
   ccls.override { llvmPackages = llvmPackages_9; stdenv = llvmPackages_9.stdenv;}'
...
CMake Error at /nix/store/jr3gkcg4ky7qvyqd9yn6jijs6621j5ql-clang-9.0.0/lib/cmake/clang/ClangTargets.cmake:579 (message):
  The imported target "clang-cpp" references the file

     "/nix/store/jr3gkcg4ky7qvyqd9yn6jijs6621j5ql-clang-9.0.0/lib/libclang-cpp.so.9"

  but this file does not exist.  Possible reasons include:

  * The file was deleted, renamed, or moved to another location.

  * An install or uninstall procedure did not complete successfully.

  * The installation package was faulty and contained

     "/nix/store/jr3gkcg4ky7qvyqd9yn6jijs6621j5ql-clang-9.0.0/lib/cmake/clang/ClangTargets.cmake"

  but not all the files it references.

Call Stack (most recent call first):
  /nix/store/jr3gkcg4ky7qvyqd9yn6jijs6621j5ql-clang-9.0.0/lib/cmake/clang/ClangConfig.cmake:18 (include)
  CMakeLists.txt:71 (find_package)
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.

Mainly tested with ccls.

Notify maintainers

cc @matthewbauer, @dtzWill

@xbreak
clang_9: Correct ClangTargets-release.cmake
6748dd4 
Since commit 4271020 libclang-cpp is also moved to $lib. This adds the missing
substitution in ClangTargets-release.cmake.
@xbreak xbreak mentioned this pull request Jan 6, 2020
Closed
10 tasks
@stolyaroleh
Copy link

I tested this change with lldb, also on NixOS.

@matthewbauer matthewbauer merged commit cc669a1 into NixOS:master Jan 6, 2020
@xbreak xbreak deleted the clang-cmake-fix branch January 9, 2020 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@xbreak @stolyaroleh @matthewbauer