janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 9644890d0004b52fddd63e4ead1b9e1dcf53bac0
Author: Jan Nieuwenhuizen <jann...@gnu.org>
Date: Thu Jul 12 21:24:34 2018 +0200
gnu: gcc-mesboot0: Revise dependencies.
* gnu/packages/mes.scm (gcc-mesboot0): Revise dependencies.
---
gnu/packages/mes.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index af96101..4a73ec9 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -899,9 +899,14 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"))))
(supported-systems '("i686-linux"))
+ (inputs '())
(native-inputs `(("binutils" ,binutils-mesboot0)
("gcc" ,gcc-core-mesboot)
("glibc" ,glibc-mesboot)
+
+ ("bootstrap-coreutils" ,%bootstrap-coreutils&co)
+ ("diffutils-boot0" ,(@@ (gnu packages commencement)
diffutils-boot0))
+ ("make-boot0" ,(@@ (gnu packages commencement)
gnu-make-boot0))
("kernel-headers" ,(linux-libre-headers-boot0))))
(outputs '("out"))
(arguments
@@ -935,18 +940,13 @@ ac_cv_c_float_format='IEEE (little-endian)'
":" (assoc-ref %build-inputs "gcc") "/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 "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 "/include" this is MES
@@ -963,7 +963,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(setenv "LD" "gcc")
(setenv "CPP" "gcc -E")
(setenv "RANLIB" "true")
- ;;(setenv "LIBS" "-lgcc2 -ltcc1")
+
(with-output-to-file "config.cache"
(lambda _
(display "
