ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mesa: Build against the regular LLVM package.

Browse source 
* gnu/packages/gl.scm (mesa)[inputs]: Change LLVM-WITHOUT-RTTI to LLVM.
* gnu/packages/llvm.scm (llvm-without-rtti): Remove variable.
This commit is contained in:
Marius Bakke 2018-12-04 17:38:22 +01:00
parent cb40e53158
commit 730a4728cc
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/gl.scm
View file

@ -257,8 +257,7 @@ (define-public mesa
("libxvmc" ,libxvmc)
,@(match (%current-system)
((or "x86_64-linux" "i686-linux")
;; FIXME: Change to 'llvm' in the next rebuild cycle.
`(("llvm" ,llvm-without-rtti)))
`(("llvm" ,llvm)))
(_
`()))
("makedepend" ,makedepend)

20
gnu/packages/llvm.scm
View file

@ -95,26 +95,6 @@ (define-public llvm
of programming tools as well as libraries with equivalent functionality.")
(license license:ncsa)))
;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686
;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of
;; this in the next rebuild cycle.
(define-public llvm-without-rtti
(package
(inherit llvm)
(arguments
`(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
"-DBUILD_SHARED_LIBS:BOOL=TRUE"
"-DLLVM_ENABLE_FFI:BOOL=TRUE"
"-DLLVM_INSTALL_UTILS=ON")
#:build-type "Release"
#:phases (modify-phases %standard-phases
(add-before 'build 'shared-lib-workaround
(lambda _
(setenv "LD_LIBRARY_PATH"
(string-append (getcwd) "/lib"))
#t)))))))
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))
(package