diff options
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 25295a283e..c4bb7d5292 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 (unmatched parenthesis <paren@disroot.org> ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org> +;;; Copyright © 2022 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -124,11 +125,11 @@ ;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed ;;; to be used in source form. -(define %mrustc-commit "b364724f15fd6fce8234ad8add68107c23a22151") +(define %mrustc-commit "597593aba86fa2edbea80c6e09f0b1b2a480722d") (define %mrustc-source (let* ((version "0.10") (commit %mrustc-commit) - (revision "1") + (revision "2") (name "mrustc")) (origin (method git-fetch) @@ -138,8 +139,14 @@ (file-name (git-file-name name (git-version version revision commit))) (sha256 (base32 - "0f7kh4n2663sn0z3xib8gzw0s97qpvwag40g2vs3bfjlrbpgi9z0")) - (patches (search-patches "mrustc-riscv64-support.patch"))))) + "09rvm3zgx1d86gippl8qzh13m641ynbw9q0zsc90g0h1khd3z3b6")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drastically reduces memory and build time requirements + ;; by disabling debug by default. + (substitute* (find-files "." "Makefile") + (("-g ") ""))))))) ;;; Rust 1.54 is special in that it is built with mrustc, which shortens the ;;; bootstrap path. @@ -229,7 +236,7 @@ (substitute* '("minicargo.mk" "run_rustc/Makefile") ;; Use the system-provided LLVM. - (("LLVM_CONFIG := .*") + (("LLVM_CONFIG [:|?]= .*") (string-append "LLVM_CONFIG := " llvm "/bin/llvm-config\n"))) (substitute* "minicargo.mk" ;; Do not try to fetch sources from the Internet. @@ -439,6 +446,7 @@ submodules = false prefix = \"" out "\" sysconfdir = \"etc\" [rust] +debug=false jemalloc=true default-linker = \"" gcc "/bin/gcc" "\" channel = \"stable\" |