mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: llvm-3.7: Inherit from llvm-6.
* gnu/packages/llvm.scm (llvm-3.7)[inherit]: Replace llvm-3.8 by llvm-6. [outputs, arguments]: Copy from llvm-3.9.1. Change-Id: Ia731ac5b4b0964277c5c0070783a951c26f28dfc
This commit is contained in:
parent
99ebec55b1
commit
bee83cb207
1 changed files with 16 additions and 2 deletions
|
@ -1150,7 +1150,7 @@ 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-3.8)
|
(package (inherit llvm-6)
|
||||||
(version "3.7.1")
|
(version "3.7.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
@ -1159,7 +1159,21 @@ Library.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"))
|
"1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"))
|
||||||
(patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch"))))))
|
(patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch"))))
|
||||||
|
(outputs '("out"))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments llvm-6)
|
||||||
|
((#:phases phases)
|
||||||
|
#~(modify-phases #$phases
|
||||||
|
(add-before 'build 'shared-lib-workaround
|
||||||
|
;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen
|
||||||
|
;; doesn't seem to get the correct rpath to be able to run
|
||||||
|
;; from the build directory. Set LD_LIBRARY_PATH as a
|
||||||
|
;; workaround.
|
||||||
|
(lambda _
|
||||||
|
(setenv "LD_LIBRARY_PATH"
|
||||||
|
(string-append (getcwd) "/lib"))))
|
||||||
|
(delete 'install-opt-viewer)))))))
|
||||||
|
|
||||||
(define-public clang-runtime-3.7
|
(define-public clang-runtime-3.7
|
||||||
(clang-runtime-from-llvm
|
(clang-runtime-from-llvm
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue