[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gcc-mesboot1: build using %boot-coreutils&co
From: |
guix-commits |
Subject: |
01/02: gcc-mesboot1: build using %boot-coreutils&co |
Date: |
Fri, 11 Jan 2019 07:48:46 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 35693842cc6435eb61c3ff9a1731851316d537e3
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Jan 11 07:31:34 2019 +0100
gcc-mesboot1: build using %boot-coreutils&co
---
gnu/packages/commencement.scm | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7b849ef..afbf3bc 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3129,21 +3129,26 @@ ac_cv_c_float_format='IEEE (little-endian)'
("mpfr-source" ,(package-source mpfr-boot))
("mpc-source" ,(package-source mpc-boot))))
(native-inputs `(("boot-patch" ,(search-patch "gcc-boot-4.7.4.patch"))
- ("bash" ,bash-mesboot)
+
+ ;; hack -- which tool is broken?
+ ("bash" ,%bootstrap-coreutils&co)
+ ("coreutils" ,%bootstrap-coreutils&co)
+
+ ;;("bash" ,bash-mesboot)
;;("binutils" ,binutils-mesboot1)
("binutils" ,binutils-mesboot0)
- ("coreutils" ,coreutils-mesboot)
+ ;;("coreutils" ,coreutils-mesboot)
("diffutils" ,diffutils-mesboot0)
;;("gawk" ,gawk-mesboot0)
- ("gawk" ,gawk-mesboot1)
+ ;;("gawk" ,gawk-mesboot1)
("gcc" ,gcc-mesboot0)
- ("gzip" ,gzip-mesboot0)
+ ;; ("gzip" ,gzip-mesboot0)
("libc" ,glibc-mesboot0)
("make" ,make-mesboot)
- ("sed" ,sed-mesboot1)
- ("tar" ,tar-mesboot2)
+ ;;("sed" ,sed-mesboot1)
+ ;;("tar" ,tar-mesboot2)
- ("gash" ,%bootstrap-gash) ; for grep
+ ;;("gash" ,%bootstrap-gash) ; for grep
("guile" ,%bootstrap-guile)
("kernel-headers" ,%bootstrap-linux-libre-headers)))
(arguments
@@ -3203,12 +3208,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")))