gnu: mesa: Stay on RTTI-less LLVM.

* gnu/packages/llvm.scm (llvm-without-rtti): New public variable.
* gnu/packages/gl.scm (mesa)[inputs]: Use that instead of LLVM.
master
Marius Bakke 2018-11-17 22:54:03 +01:00
parent 0a41123f01
commit f8cba3ff4f
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 22 additions and 1 deletions

View File

@ -259,7 +259,8 @@ also known as DXTn or DXTC) for Mesa.")
("libxvmc" ,libxvmc)
,@(match (%current-system)
((or "x86_64-linux" "i686-linux")
`(("llvm" ,llvm)))
;; FIXME: Change to 'llvm' in the next rebuild cycle.
`(("llvm" ,llvm-without-rtti)))
(_
`()))
("makedepend" ,makedepend)

View File

@ -91,6 +91,26 @@ languages is in development. The compiler infrastructure includes mirror sets
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