[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: llvm: Build with RTTI by default.
From: |
Eric Bavier |
Subject: |
01/03: llvm: Build with RTTI by default. |
Date: |
Sat, 17 Nov 2018 01:40:12 -0500 (EST) |
bavier pushed a commit to branch master
in repository guix.
commit fc9dbf41311d99d0fd8befc789ea7c0e35911890
Author: Eric Bavier <address@hidden>
Date: Fri Oct 5 22:58:43 2018 -0500
llvm: Build with RTTI by default.
Increases size of address@hidden by 2.5MiB (2.5%), but saves building
specialized
llvm's with rtti enabled for packages that require RTTI when linking with
the
llvm libraries.
* gnu/packages/llvm.scm (llvm-3.8-with-rtti): Remove variable.
(llvm)[arguments]: Add '-DLLVM_REQUIRES_RTTI=1' to #:configure-flags.
* gnu/packages/audio.scm (faust-2)[native-inputs]:
'llvm-3.8-with-rtti' -> 'llvm-3.8'.
---
gnu/packages/audio.scm | 2 +-
gnu/packages/llvm.scm | 15 ++-------------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 3258bf3..6795ddd 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1234,7 +1234,7 @@ PS, and DAB+.")
`(list (string-append "prefix=" (assoc-ref %outputs "out"))
"world"))))
(native-inputs
- `(("llvm" ,llvm-3.8-with-rtti)
+ `(("llvm" ,llvm-3.8)
("which" ,which)
("xxd" ,xxd)
("ctags" ,emacs-minimal) ; for ctags
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index a809180..beca926 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2016 Eric Bavier <address@hidden>
+;;; Copyright © 2014, 2016, 2018 Eric Bavier <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 Dennis Mungai <address@hidden>
@@ -65,6 +65,7 @@
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
"-DBUILD_SHARED_LIBS:BOOL=TRUE"
"-DLLVM_ENABLE_FFI:BOOL=TRUE"
+ "-DLLVM_REQUIRES_RTTI=1" ; For some third-party
utilities
"-DLLVM_INSTALL_UTILS=ON") ; Needed for rustc.
;; Don't use '-g' during the build, to save space.
@@ -279,18 +280,6 @@ code analysis tools.")
(base32
"1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))))))
-;; This is for Faust 2
-(define-public llvm-3.8-with-rtti
- (package (inherit llvm-3.8)
- (name "llvm-with-rtti")
- (arguments
- (substitute-keyword-arguments (package-arguments llvm)
- ((#:configure-flags flags)
- `(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
- "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
- "-DLLVM_REQUIRES_RTTI=1")
- ,flags))))))
-
(define-public clang-runtime-3.8
(clang-runtime-from-llvm
llvm-3.8