summaryrefslogtreecommitdiff
path: root/gnu/packages/rust.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2024-01-10 11:25:25 +0200
committerEfraim Flashner <efraim@flashner.co.il>2024-02-20 13:57:41 +0200
commit4c60c6e412cdc788f0f49872fbbe61deea66ccc8 (patch)
treeb7c87fdadd0f11cc254bf9653f6a498322ba914c /gnu/packages/rust.scm
parent3c30b715f05463822cafd20c90d503ebbfd832fc (diff)
gnu: mrustc: Update to 0.10.1.
* gnu/packages/rust.scm (%mrustc-commit, %mrustc-source): Update. [snippet]: Adjust snippet to make sure to get all the '-g' flags. (rust-bootstrap)[arguments]: Remove substitution adjusting the number of parallel builds. Remove unneeded substitution. * gnu/packages/patches/rustc-1.54.0-src.patch: Refresh from upstream. Change-Id: I6f806ee89dcb8e95e8bd2d443328844079ee533e
Diffstat (limited to 'gnu/packages/rust.scm')
-rw-r--r--gnu/packages/rust.scm20
1 files changed, 8 insertions, 12 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 15d63be14dc..e3cad4e585f 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -4,7 +4,7 @@
4;;; Copyright © 2016 Nikita <nikita@n0.is> 4;;; Copyright © 2016 Nikita <nikita@n0.is>
5;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> 5;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
6;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org> 6;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
7;;; Copyright © 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il> 7;;; Copyright © 2017, 2019-2024 Efraim Flashner <efraim@flashner.co.il>
8;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> 8;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
9;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org> 9;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
10;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> 10;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
@@ -121,27 +121,28 @@
121 121
122;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed 122;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed
123;;; to be used in source form. 123;;; to be used in source form.
124(define %mrustc-commit "597593aba86fa2edbea80c6e09f0b1b2a480722d") 124(define %mrustc-commit "b6754f574f8846eb842feba4ccbeeecb10bdfacc")
125(define %mrustc-source 125(define %mrustc-source
126 (let* ((version "0.10") 126 (let* ((version "0.10.1")
127 (commit %mrustc-commit) 127 (commit %mrustc-commit)
128 (revision "2") 128 (revision "1")
129 (name "mrustc")) 129 (name "mrustc"))
130 (origin 130 (origin
131 (method git-fetch) 131 (method git-fetch)
132 (uri (git-reference 132 (uri (git-reference
133 (url "https://github.com/thepowersgang/mrustc") 133 (url "https://github.com/thepowersgang/mrustc")
134 (commit commit))) 134 (commit (string-append "v" version))))
135 (file-name (git-file-name name (git-version version revision commit))) 135 (file-name (git-file-name name version))
136 (sha256 136 (sha256
137 (base32 137 (base32
138 "09rvm3zgx1d86gippl8qzh13m641ynbw9q0zsc90g0h1khd3z3b6")) 138 "0rqiif7rb5hg6ik3i1flldj311f014q4n9z8wb50cs8kspjz32di"))
139 (modules '((guix build utils))) 139 (modules '((guix build utils)))
140 (snippet 140 (snippet
141 '(begin 141 '(begin
142 ;; Drastically reduces memory and build time requirements 142 ;; Drastically reduces memory and build time requirements
143 ;; by disabling debug by default. 143 ;; by disabling debug by default.
144 (substitute* (find-files "." "Makefile") 144 (substitute* (find-files "." "Makefile")
145 (("LINKFLAGS := -g") "LINKFLAGS :=")
145 (("-g ") ""))))))) 146 (("-g ") "")))))))
146 147
147;;; Rust 1.54 is special in that it is built with mrustc, which shortens the 148;;; Rust 1.54 is special in that it is built with mrustc, which shortens the
@@ -260,11 +261,6 @@
260 (("\\$\\(MINICARGO\\) \\$\\(RUSTC_SRC_DL\\)") 261 (("\\$\\(MINICARGO\\) \\$\\(RUSTC_SRC_DL\\)")
261 "$(MINICARGO)")) 262 "$(MINICARGO)"))
262 (substitute* "run_rustc/Makefile" 263 (substitute* "run_rustc/Makefile"
263 (("[$]Vtime ")
264 "$V ")
265 ;; Unlock the number of parallel jobs for cargo.
266 (("-j [[:digit:]]+ ")
267 "")
268 ;; Patch the shebang of a generated wrapper for rustc 264 ;; Patch the shebang of a generated wrapper for rustc
269 (("#!/bin/sh") 265 (("#!/bin/sh")
270 (string-append "#!" (which "sh")))) 266 (string-append "#!" (which "sh"))))