diff options
| author | Ivan Petkov <ivanppetkov@gmail.com> | 2019-06-17 22:10:52 -0700 |
|---|---|---|
| committer | Ivan Petkov <ivanppetkov@gmail.com> | 2019-06-28 18:31:51 -0700 |
| commit | f5de2b9a3e0070ec431e01c279192e6d93d6a1c8 (patch) | |
| tree | 2344061618b91826d3e857f341a1a25265ad9a45 | |
| parent | f676b2a45fd3f91eb12006adb957ff55bfe8514b (diff) | |
| download | guix-f5de2b9a3e0070ec431e01c279192e6d93d6a1c8.tar guix-f5de2b9a3e0070ec431e01c279192e6d93d6a1c8.tar.gz | |
gnu: rust: use llvm@8
* gnu/packages/llvm.scm (llvm): Rename to...
(llvm-8): ...this.
(llvm): New variable.
* gnu/packages/rust.scm (rust)[inputs]: Use llvm-8
| -rw-r--r-- | gnu/packages/llvm.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/rust.scm | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index faf9e40049..0315740bcd 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -48,7 +48,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages xml)) -(define-public llvm +(define-public llvm-8 (package (name "llvm") (version "8.0.0") @@ -99,6 +99,8 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) +(define-public llvm llvm-8) + (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c83c8a6784..9444d8be73 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1056,6 +1056,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas"))) (package (inherit base-rust) + (inputs + (alist-replace "llvm" (list llvm-8) + (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) |