[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/09: gnu: clang@10, clang@11: Fix CMake files.
From: |
guix-commits |
Subject: |
05/09: gnu: clang@10, clang@11: Fix CMake files. |
Date: |
Thu, 22 Oct 2020 12:49:06 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit f91046ce67fcf75183c749fec7dc603d5eba8838
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Oct 21 21:23:24 2020 +0200
gnu: clang@10, clang@11: Fix CMake files.
* gnu/packages/llvm.scm (clang-from-llvm): Add phase adjust-cmake-file when
building Clang 10 or later.
---
gnu/packages/llvm.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index c500430..eb93433 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -326,6 +326,27 @@ given PATCHES. When TOOLS-EXTRA is given, it must point
to the
(("@GLIBC_LIBDIR@")
(string-append libc "/lib"))))))
#t)))
+ ,@(if (version>=? version "10")
+ `((add-after 'install 'adjust-cmake-file
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; Clang generates a CMake file with "targets"
+ ;; for each installed library file. Downstream
+ ;; consumers of the CMake interface can use
this
+ ;; to get absolute library locations.
Including
+ ;; this file will needlessly assert that _all_
+ ;; libraries are available, which causes
problems
+ ;; in Guix because some are removed (see the
+ ;; move-extra-tools phase). Thus, remove the
+ ;; asserts so that the main functionality
works.
+ (substitute*
+ (string-append
+ out
+
"/lib/cmake/clang/ClangTargets-release.cmake")
+ (("list\\(APPEND _IMPORT_CHECK_TARGETS.*"
all)
+ (string-append "# Disabled by Guix.\n#"
all)))
+ #t))))
+ '())
,@(if (version>? version "3.8")
`((add-after 'install 'symlink-cfi_blacklist
(lambda* (#:key inputs outputs #:allow-other-keys)
- branch master updated (cad55e9 -> 3e09453), guix-commits, 2020/10/22
- 01/09: gnu: universal-ctags: Update to 5.9.20201018.0., guix-commits, 2020/10/22
- 03/09: gnu: ungoogled-chromium: Embed absolute references to libGL and friends., guix-commits, 2020/10/22
- 05/09: gnu: clang@10, clang@11: Fix CMake files.,
guix-commits <=
- 07/09: gnu: srt: Remove unused input., guix-commits, 2020/10/22
- 09/09: gnu: srt: Disable code coverage checking., guix-commits, 2020/10/22
- 02/09: gnu: universal-ctags: Store temporary files below "/tmp"., guix-commits, 2020/10/22
- 04/09: gnu: ungoogled-chromium: Update to 86.0.4240.111-0.c34a56d [security fixes]., guix-commits, 2020/10/22
- 06/09: gnu: Add LLDB., guix-commits, 2020/10/22
- 08/09: gnu: srt: Do not build the static library., guix-commits, 2020/10/22