summaryrefslogtreecommitdiff
path: root/gnu/packages/llvm.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-02-03 09:44:14 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-02-03 15:29:14 +0100
commita6046f24ddd34b44418a2d1b02a84ddcc61b47aa (patch)
tree925821d88e3b5d1a8b259a0de9adb73728bed651 /gnu/packages/llvm.scm
parent5d8c7f2f596f0445cebc46b194370f2146ed1e29 (diff)
gnu: llvm@3: Do not inherit 'install-opt-viewer' phase.
This is a follow-up to commit 50b61ec22306181c419a3bd4c35b3c001c604994. * gnu/packages/llvm.scm (llvm-3.9.1)[outputs, arguments]: New fields. (llvm-3.8, llvm-3.7, llvm-3.6, llvm-3.5): Inherit from LLVM-3.9.1.
Diffstat (limited to 'gnu/packages/llvm.scm')
-rw-r--r--gnu/packages/llvm.scm18
1 files changed, 12 insertions, 6 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index ae5fe72d93..e333ab7638 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
@@ -574,7 +574,13 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
- "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"))))))
+ "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"))))
+ (outputs '("out"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments llvm)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'install-opt-viewer)))))))
(define-public clang-runtime-3.9.1
(clang-runtime-from-llvm
@@ -590,7 +596,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
#:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.8
- (package (inherit llvm)
+ (package (inherit llvm-3.9.1)
(name "llvm")
(version "3.8.1")
(source
@@ -615,7 +621,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
#:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.7
- (package (inherit llvm)
+ (package (inherit llvm-3.9.1)
(version "3.7.1")
(source
(origin
@@ -639,7 +645,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
#:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-3.6
- (package (inherit llvm)
+ (package (inherit llvm-3.9.1)
(version "3.6.2")
(source
(origin
@@ -662,7 +668,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
#:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-3.5
- (package (inherit llvm)
+ (package (inherit llvm-3.9.1)
(version "3.5.2")
(source
(origin