me
/
guix
Archived
1
0
Fork 0
Code

gnu: llvm@3: Do not inherit 'install-opt-viewer' phase. 

This is a follow-up to commit 50b61ec223.

* 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.
master
Marius Bakke 2020-02-03 09:44:14 +01:00
parent 5d8c7f2f59
commit a6046f24dd
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/llvm.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com> ;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; 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, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; 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")) version "/llvm-" version ".src.tar.xz"))
(sha256 (sha256
(base32 (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 (define-public clang-runtime-3.9.1
(clang-runtime-from-llvm (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"))) #:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.8 (define-public llvm-3.8
(package (inherit llvm) (package (inherit llvm-3.9.1)
(name "llvm") (name "llvm")
(version "3.8.1") (version "3.8.1")
(source (source
@ -615,7 +621,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
#:patches '("clang-3.8-libc-search-path.patch"))) #:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.7 (define-public llvm-3.7
(package (inherit llvm) (package (inherit llvm-3.9.1)
(version "3.7.1") (version "3.7.1")
(source (source
(origin (origin
@ -639,7 +645,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
#:patches '("clang-3.5-libc-search-path.patch"))) #:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-3.6 (define-public llvm-3.6
(package (inherit llvm) (package (inherit llvm-3.9.1)
(version "3.6.2") (version "3.6.2")
(source (source
(origin (origin
@ -662,7 +668,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
#:patches '("clang-3.5-libc-search-path.patch"))) #:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-3.5 (define-public llvm-3.5
(package (inherit llvm) (package (inherit llvm-3.9.1)
(version "3.5.2") (version "3.5.2")
(source (source
(origin (origin