diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-01-10 11:25:25 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-02-20 13:57:41 +0200 |
| commit | 4c60c6e412cdc788f0f49872fbbe61deea66ccc8 (patch) | |
| tree | b7c87fdadd0f11cc254bf9653f6a498322ba914c /gnu/packages/rust.scm | |
| parent | 3c30b715f05463822cafd20c90d503ebbfd832fc (diff) | |
| download | guix-4c60c6e412cdc788f0f49872fbbe61deea66ccc8.tar guix-4c60c6e412cdc788f0f49872fbbe61deea66ccc8.tar.gz | |
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.scm | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 15d63be14d..e3cad4e585 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org> -;;; Copyright © 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2019-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> @@ -121,27 +121,28 @@ ;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed ;;; to be used in source form. -(define %mrustc-commit "597593aba86fa2edbea80c6e09f0b1b2a480722d") +(define %mrustc-commit "b6754f574f8846eb842feba4ccbeeecb10bdfacc") (define %mrustc-source - (let* ((version "0.10") + (let* ((version "0.10.1") (commit %mrustc-commit) - (revision "2") + (revision "1") (name "mrustc")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/thepowersgang/mrustc") - (commit commit))) - (file-name (git-file-name name (git-version version revision commit))) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "09rvm3zgx1d86gippl8qzh13m641ynbw9q0zsc90g0h1khd3z3b6")) + "0rqiif7rb5hg6ik3i1flldj311f014q4n9z8wb50cs8kspjz32di")) (modules '((guix build utils))) (snippet '(begin ;; Drastically reduces memory and build time requirements ;; by disabling debug by default. (substitute* (find-files "." "Makefile") + (("LINKFLAGS := -g") "LINKFLAGS :=") (("-g ") ""))))))) ;;; Rust 1.54 is special in that it is built with mrustc, which shortens the @@ -260,11 +261,6 @@ (("\\$\\(MINICARGO\\) \\$\\(RUSTC_SRC_DL\\)") "$(MINICARGO)")) (substitute* "run_rustc/Makefile" - (("[$]Vtime ") - "$V ") - ;; Unlock the number of parallel jobs for cargo. - (("-j [[:digit:]]+ ") - "") ;; Patch the shebang of a generated wrapper for rustc (("#!/bin/sh") (string-append "#!" (which "sh")))) |