diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2018-10-05 22:58:43 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2018-11-17 00:19:53 -0600 |
| commit | fc9dbf41311d99d0fd8befc789ea7c0e35911890 (patch) | |
| tree | 860b2e0a01e2a9b5fb3abc84c659cd2fb1b463cd /gnu | |
| parent | 0c7707d53e66839a2beae8c05eddc91ac5a6d5e1 (diff) | |
| download | guix-fc9dbf41311d99d0fd8befc789ea7c0e35911890.tar.gz | |
llvm: Build with RTTI by default.
Increases size of llvm@6 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'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/audio.scm | 2 | ||||
| -rw-r--r-- | 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 3258bf3a67..6795ddd21c 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 a809180e29..beca92650e 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 <bavier@member.fsf.org> +;;; Copyright © 2014, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com> @@ -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 |