aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-06-21 14:14:04 -0400
committerMark H Weaver <mhw@netris.org>2015-06-21 14:14:04 -0400
commitfc9ff915b3cfcb494dbb5c8ab767972352fa31da (patch)
treea088d3f4584161186848782a8fd8dd58c6579b1a /gnu
parent194782a881fbcf6ac47122a0e85fbe5b69c6af58 (diff)
downloadguix-fc9ff915b3cfcb494dbb5c8ab767972352fa31da.tar
guix-fc9ff915b3cfcb494dbb5c8ab767972352fa31da.tar.gz
gnu: jemalloc: Build with gcc-4.8 on i686.
* gnu/packages/jemalloc.scm (jemalloc)[native-inputs]: When compiling natively on i686, add gcc-4.8.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/jemalloc.scm8
1 files changed, 8 insertions, 0 deletions
diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm
index 8a25cb08b8..5b4c2e0853 100644
--- a/gnu/packages/jemalloc.scm
+++ b/gnu/packages/jemalloc.scm
@@ -20,6 +20,8 @@
#:use-module ((guix licenses) #:select (bsd-2))
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages gcc)
#:use-module (guix build-system gnu))
(define-public jemalloc
@@ -35,6 +37,12 @@
(base32
"1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71"))))
(build-system gnu-build-system)
+ ;; XXX FIXME: Use gcc-4.8 on i686 to work around
+ ;; <http://bugs.gnu.org/20856>.
+ (native-inputs (if (and (not (%current-target-system))
+ (string-prefix? "i686-" (%current-system)))
+ `(("gcc" ,(canonical-package gcc-4.8)))
+ '()))
(home-page "http://www.canonware.com/jemalloc/")
(synopsis "General-purpose scalable concurrent malloc implementation")
(description