diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-05-26 17:11:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-05-26 17:11:20 +0200 |
| commit | 7097e98586df3110b80943a88c27804d65f214fa (patch) | |
| tree | 2e244b9fc19acc569d6abd42306aaf013f02da0d /gnu/packages/llvm.scm | |
| parent | 15870cc08d20501e3526fa892111a43ae9e3e02f (diff) | |
| parent | 4577f3c6b60ea100e521c246fb169d6c05214b20 (diff) | |
| download | guix-7097e98586df3110b80943a88c27804d65f214fa.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/llvm.scm')
| -rw-r--r-- | gnu/packages/llvm.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index b84d987dbb..c93c1db7fe 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -389,6 +389,9 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the (variable "CPLUS_INCLUDE_PATH") (files '("include/c++" "include"))) (search-path-specification + (variable "OBJC_INCLUDE_PATH") + (files '("include"))) + (search-path-specification (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) @@ -624,7 +627,16 @@ of programming tools as well as libraries with equivalent functionality.") ,@(package-native-inputs template)))))) (define-public clang-14 - (let ((template (clang-from-llvm llvm-14 clang-runtime-14))) + (let ((template + (clang-from-llvm llvm-14 clang-runtime-14 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-14))) + (sha256 + (base32 + "188hh6l956gkl6hgjzzdraj5jp538zhhhllxvy23gml6slrmbj7j")))))) (package (inherit template) (arguments |