janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 2077dc0ec39b73e68f4c9f9ddf1b6f8f59eb71d3
Author: Jan Nieuwenhuizen <[email protected]>
Date: Thu Jul 12 21:40:03 2018 +0200
gnu: gcc-mesboot: Revise dependencies.
* gnu/packages/mes.scm (gcc-mesboot): Revise dependencies.
---
gnu/packages/mes.scm | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 17c8fa3..b0831d2 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -1088,7 +1088,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
(native-inputs `(("binutils-boot" ,binutils-mesboot)
("gcc-boot" ,gcc-mesboot0)
("glibc-boot" ,glibc-mesboot)
- ("kernel-headers" ,(linux-libre-headers-boot0))))
+
+ ("bootstrap-coreutils" ,%bootstrap-coreutils&co)
+ ("diffutils-boot0" ,(@@ (gnu packages commencement)
diffutils-boot0))
+ ("kernel-headers" ,(linux-libre-headers-boot0))
+ ("make-boot0" ,(@@ (gnu packages commencement)
gnu-make-boot0))))
(inputs `(("gmp-source" ,(package-source gmp-boot))
("mpfr-source" ,(package-source mpfr-boot))
("mpc-source" ,(package-source mpc))))
@@ -1184,21 +1188,13 @@ ac_cv_c_float_format='IEEE (little-endian)'
":" (assoc-ref %build-inputs "gcc-boot") "/bin"
;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ":" (assoc-ref %build-inputs "file") "/bin"
- ":" (assoc-ref %build-inputs "findutils") "/bin"
- ":" (assoc-ref %build-inputs "gawk") "/bin"
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ":" (assoc-ref %build-inputs "sed") "/bin"
- ":" (assoc-ref %build-inputs "tar") "/bin"))
+ ":" (assoc-ref %build-inputs "bootstrap-coreutils")
"/bin"
+ ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin"
+ ":" (assoc-ref %build-inputs "make-boot0") "/bin"))
(format (current-error-port) "PATH=~a\n" (getenv "PATH"))
(setenv "CONFIG_SHELL" (string-append
- (assoc-ref %build-inputs "bash")
+ (assoc-ref %build-inputs
"bootstrap-coreutils")
"/bin/sh"))
(setenv "C_INCLUDE_PATH" (string-append
gcc
"/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"
