guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: chez-scheme-for-racket-bootstrap-bootfiles: Remove workaroun


From: guix-commits
Subject: 03/04: gnu: chez-scheme-for-racket-bootstrap-bootfiles: Remove workaround.
Date: Fri, 8 Sep 2023 02:12:06 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit bb20ab942e03cd9309e3ecbef22ea2f2946810db
Author: Philip McGrath <philip@philipmcgrath.com>
AuthorDate: Wed Aug 23 20:08:06 2023 -0400

    gnu: chez-scheme-for-racket-bootstrap-bootfiles: Remove workaround.
    
    Architecture autodetection in rktboot was fixed upstream, and the fix is
    included in racket-backport-8.10-rktboot.patch for Guix. This commit
    goes beyond reverting b4fbeae3d90a5d0f8146441772436df2eb471491: the
    upstream fix also supports 'pbarch' machine types, so we never need to
    supply a '--machine' argument to rktboot.
    
    * gnu/packages/chez.scm (chez-scheme-for-racket-bootstrap-bootfiles)
    [arguments]: Change 'build' phase to never use '--machine' for rktboot.
    
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/chez.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index e5694ec1cf..3f53beac1a 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -691,13 +691,7 @@ source.")))
                       #~(invoke
                          (search-input-file (or native-inputs inputs)
                                             "/opt/racket-vm/bin/racket")
-                         "../rktboot/main.rkt"
-                         ;; Temporary handling of builds on non-x86 
architectures,
-                         ;; see https://github.com/racket/racket/issues/3948
-                         ;; Autodetect in rktboot only addresses x86 archs, so 
far.
-                         #$@(let ((m (or (racket-cs-native-supported-system?)
-                                         (nix-system->pbarch-machine-type))))
-                              #~("--machine" #$m))))))))))))
+                         "../rktboot/main.rkt"))))))))))
     (supported-systems
      (package-supported-systems chez-scheme-for-racket))
     (home-page "https://github.com/racket/ChezScheme";)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]