From 92bd81a96f4cac9d0fe628b82ffb1d127ad3e42f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Mar 2024 13:06:09 +0200 Subject: transformations: Add support for rust. * guix/transformations.scm (tuning-compiler): Add support for rustc. Change-Id: I6db596a586eda648666550cdcadaa5e1704cb79c --- guix/transformations.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'guix') 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 ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2023 Sarthak Shah -;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2023, 2024 Efraim Flashner ;;; Copyright © 2023 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. @@ -499,6 +499,10 @@ (define this "-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 @@ (define bin (string-append #$output "/bin")) (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 -- cgit v1.2.3 From a26bce55e60aa3444c4378d3996f3aa41b9661e9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 11 Mar 2024 22:07:43 +0100 Subject: time-machine: Allow time travels to v0.16.0. * guix/scripts/time-machine.scm (%oldest-possible-commit): Change to v0.16.0. * tests/guix-time-machine.sh: Adjust comment. Change-Id: I9ad82bd45fee0d172b5348a8ae16e990338a3a97 --- guix/scripts/time-machine.scm | 4 ++-- tests/guix-time-machine.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'guix') 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 -;;; Copyright © 2019, 2020, 2021, 2023 Ludovic Courtès +;;; Copyright © 2019-2021, 2023-2024 Ludovic Courtès ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2023 Maxim Cournoyer ;;; @@ -147,7 +147,7 @@ (define (parse-args args) ;;; 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/tests/guix-time-machine.sh b/tests/guix-time-machine.sh index 983f796225..df75c681da 100644 --- a/tests/guix-time-machine.sh +++ b/tests/guix-time-machine.sh @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2023 Maxim Cournoyer -# Copyright © 2023 Ludovic Courtès +# Copyright © 2023-2024 Ludovic Courtès # # This file is part of GNU Guix. # @@ -39,7 +39,7 @@ else EXTRA_OPTIONS="" fi -# Visiting a commit older than v1.0.0 must fail (this test is expensive +# Visiting a commit older than v0.16.0 must fail (this test is expensive # because it clones the whole repository). guix time-machine -q --commit=v0.15.0 $EXTRA_OPTIONS -- describe && false -- cgit v1.2.3