me/guix
Archived
1
0
Fork 0
Code Activity

gnu: rust-1.55: Build without jemalloc.

Browse source 
* gnu/packages/rust.scm (rust-1.55)[arguments]: Remove references to
jemalloc in custom 'configure phase and set rust to build without
jemalloc.
[inputs]: Remove jemalloc.

Change-Id: I388688111c897b15feb6ccee3374219b82f64169
This commit is contained in:
Efraim Flashner 2023-12-17 19:55:51 +02:00
parent 3a076fc06e
commit 1151cd6cf0
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/rust.scm
View file

@ -46,7 +46,6 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gdb) #:use-module (gnu packages gdb)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
@ -441,16 +440,7 @@ safety and thread safety guarantees.")
(binutils (assoc-ref inputs "binutils")) (binutils (assoc-ref inputs "binutils"))
(rustc (assoc-ref inputs "rustc-bootstrap")) (rustc (assoc-ref inputs "rustc-bootstrap"))
(cargo (assoc-ref inputs "cargo-bootstrap")) (cargo (assoc-ref inputs "cargo-bootstrap"))
(llvm (assoc-ref inputs "llvm")) (llvm (assoc-ref inputs "llvm")))
(jemalloc (assoc-ref inputs "jemalloc")))
;; The compiler is no longer directly built against jemalloc, but
;; rather via the jemalloc-sys crate (which vendors the jemalloc
;; source). To use jemalloc we must enable linking to it (otherwise
;; it would use the system allocator), and set an environment
;; variable pointing to the compiled jemalloc.
(setenv "JEMALLOC_OVERRIDE"
(search-input-file inputs
"/lib/libjemalloc_pic.a"))
(call-with-output-file "config.toml" (call-with-output-file "config.toml"
(lambda (port) (lambda (port)
(display (string-append " (display (string-append "
@ -467,7 +457,7 @@ prefix = \"" out "\"
sysconfdir = \"etc\" sysconfdir = \"etc\"
[rust] [rust]
debug=false debug=false
jemalloc=true jemalloc=false
default-linker = \"" gcc "/bin/gcc" "\" default-linker = \"" gcc "/bin/gcc" "\"
channel = \"stable\" channel = \"stable\"
rpath = true rpath = true
@ -533,8 +523,7 @@ ar = \"" binutils "/bin/ar" "\"
("cargo-bootstrap" ,rust-bootstrap "cargo") ("cargo-bootstrap" ,rust-bootstrap "cargo")
("which" ,which))) ("which" ,which)))
(inputs (inputs
`(("jemalloc" ,jemalloc) `(("llvm" ,llvm-13)
("llvm" ,llvm-13)
("openssl" ,openssl) ("openssl" ,openssl)
("libssh2" ,libssh2) ; For "cargo" ("libssh2" ,libssh2) ; For "cargo"
("libcurl" ,curl))) ; For "cargo" ("libcurl" ,curl))) ; For "cargo"