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

clang_9: Correct ClangTargets-release.cmake #76669

Merged
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

Since commit 4271020 libclang-cpp is also moved to $lib. This adds the missing
substitution in ClangTargets-release.cmake.
@xbreak xbreak requested a review from matthewbauer as a code owner Dec 29, 2019
@xbreak xbreak mentioned this pull request Jan 6, 2020
2 of 10 tasks complete
@stolyaroleh
Copy link

@stolyaroleh stolyaroleh commented Jan 6, 2020

I tested this change with lldb, also on NixOS.

@matthewbauer matthewbauer merged commit cc669a1 into NixOS:master Jan 6, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
clang_9 on aarch64-linux Success
Details
clang_9 on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@xbreak xbreak deleted the xbreak:clang-cmake-fix branch Jan 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.