diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-03-16 10:19:30 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-03-16 10:19:30 +0000 |
| commit | 618cae45dc2a45079e910e72be2062c58590f262 (patch) | |
| tree | 45536e51dafe3d34bd2cf55ee252e3345bf08803 /guix | |
| parent | 2ee54513196bad8e663e78ac695b6ffa0da49051 (diff) | |
| parent | 00bf07ecccee86da4ced281bd28948c96db284e6 (diff) | |
| download | guix-618cae45dc2a45079e910e72be2062c58590f262.tar guix-618cae45dc2a45079e910e72be2062c58590f262.tar.gz | |
Merge remote-tracking branch 'savannah/master' into gnome-team
Change-Id: I775274c2693536e2efa36c9abca4c54c5c458e26
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/time-machine.scm | 4 | ||||
| -rw-r--r-- | guix/transformations.scm | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index 2c30fe7cfd..d9ce85df84 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Konrad Hinsen <konrad.hinsen@fastmail.net> -;;; Copyright © 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019-2021, 2023-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; @@ -147,7 +147,7 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) ;;; firmed up in v1.0.0; it is the oldest, safest commit that can be travelled ;;; to. (define %oldest-possible-commit - "6298c3ffd9654d3231a6f25390b056483e8f407c") ;v1.0.0 + "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c") ;v0.16.0 (define %reference-channels (list (channel (inherit %default-guix-channel) diff --git a/guix/transformations.scm b/guix/transformations.scm index 132ccd957a..f02b9f94d6 100644 --- a/guix/transformations.scm +++ b/guix/transformations.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2023 Sarthak Shah <shahsarthakw@gmail.com> -;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2023 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; ;;; This file is part of GNU Guix. @@ -499,6 +499,10 @@ actual compiler." "-Dcpu=" (string-replace-substring #$micro-architecture "-" "_")))) + ((and (search-next "rustc") + (string=? next (search-next "rustc"))) + (list "-C" (string-append "target_cpu=" + #$micro-architecture))) (else (list (string-append "-march=" #$micro-architecture)))))))))))) @@ -519,7 +523,7 @@ actual compiler." (symlink #$program (string-append bin "/" program))) '("cc" "gcc" "clang" "g++" "c++" "clang++" - "go" "zig"))))))) + "go" "rustc" "zig"))))))) (define (build-system-with-tuning-compiler bs micro-architecture) "Return a variant of BS, a build system, that ensures that the compiler that |