guix-commits
[Top][All Lists]
Advanced

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

03/04: checkpoint gcc-core-mesboot1: remove grep-seed, gash grep is fine


From: guix-commits
Subject: 03/04: checkpoint gcc-core-mesboot1: remove grep-seed, gash grep is fine.
Date: Fri, 11 Jan 2019 09:51:03 -0500 (EST)

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 4935d016611a825b190a9edd44c17c5ce8951cd7
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Jan 11 15:28:50 2019 +0100

    checkpoint gcc-core-mesboot1: remove grep-seed, gash grep is fine.
---
 gnu/packages/commencement.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9041ef0..037789b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3341,7 +3341,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
 
                       ("bash" ,bash-seed)
                       ;; ("gawk" ,gawk-seed)
-                      ("grep" ,grep-seed)
+                      ;; Gash's grep is fine
+                      ;; ("grep" ,grep-seed)
                       ("sed" ,sed-seed)
 
                       ;; both broken
@@ -3428,12 +3429,12 @@ ac_cv_c_float_format='IEEE (little-endian)'
                 "--disable-build-with-cxx"))
         #:phases
         (modify-phases %standard-phases
-          ;; (add-before 'unpack 'set-path
-          ;;   (lambda _
-          ;;     (let ((gash (assoc-ref %build-inputs "gash")))
-          ;;       (setenv "PATH" (string-append  (getenv "PATH") ":" gash 
"/libexec/gash:"))
-          ;;       (format #t "PATH=~s\n" (getenv "PATH"))
-          ;;       #t)))
+          (add-before 'unpack 'set-path
+            (lambda _
+              (let ((gash (assoc-ref %build-inputs "gash")))
+                (setenv "PATH" (string-append  (getenv "PATH") ":" gash 
"/libexec/gash:"))
+                (format #t "PATH=~s\n" (getenv "PATH"))
+                #t)))
           (add-after 'unpack 'patch
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((patch-file (assoc-ref inputs "boot-patch")))



reply via email to

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