diff options
| author | Maxim Cournoyer <[email protected]> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/llvm.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/llvm.scm')
| -rw-r--r-- | gnu/packages/llvm.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 58bd91d7be..e5bf9f5cae 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -50,7 +50,6 @@ #:use-module (guix git-download) #:use-module (guix memoization) #:use-module (guix utils) - #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system python) @@ -562,11 +561,11 @@ output), and Binutils.") (define %llvm-monorepo-hashes '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") - ("15.0.6" . "13vj0q6if5095a3awq8d97l17qdsc7fks6avkai9k80kl0kzxpv6"))) + ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) - ("15.0.6" . ("clang-15.0-libc-search-path.patch")))) + ("15.0.7" . ("clang-15.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -582,7 +581,7 @@ output), and Binutils.") (define-public llvm-15 (package (name "llvm") - (version "15.0.6") + (version "15.0.7") (source (llvm-monorepo version)) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) @@ -739,7 +738,7 @@ of programming tools as well as libraries with equivalent functionality.") (package-version llvm-15))) (sha256 (base32 - "099v2yqg11h0h8qqddzkny6b77pafcr7vy5ksc33kqggji173ccj"))))) + "1lagnspm5limxh1cp5jlixnzlhf09905d4rqra1kpgj6dps2x6l0"))))) (define-public clang-14 (clang-from-llvm @@ -2258,7 +2257,7 @@ LLVM.")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "lib/Interpreter/CIFactory.cpp" - (("\bsed\b") + (("\\bsed\\b") (which "sed")) ;; This ensures that the default C++ library used by Cling is ;; that of the compiler that was used to build it, rather |