diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-04 17:38:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-04 20:05:21 +0100 |
| commit | 730a4728cc38799f9683bde5a0711ab10d42a9f8 (patch) | |
| tree | ef24fccabc888af76bb1110ced02b21058a216a3 | |
| parent | cb40e53158164dc689f783f67672277db73daf20 (diff) | |
| download | guix-730a4728cc38799f9683bde5a0711ab10d42a9f8.tar.gz | |
gnu: mesa: Build against the regular LLVM package.
* gnu/packages/gl.scm (mesa)[inputs]: Change LLVM-WITHOUT-RTTI to LLVM. * gnu/packages/llvm.scm (llvm-without-rtti): Remove variable.
| -rw-r--r-- | gnu/packages/gl.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/llvm.scm | 20 |
2 files changed, 1 insertions, 22 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3968e4379d..1bf53bcbb4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -257,8 +257,7 @@ also known as DXTn or DXTC) for 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) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8a9d1d312b..4be86f3d21 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -95,26 +95,6 @@ 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 |