[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: gnu: Add gcc-mesboot-wrapper 4.7.4.
From: |
Jan Nieuwenhuizen |
Subject: |
01/07: gnu: Add gcc-mesboot-wrapper 4.7.4. |
Date: |
Fri, 31 Aug 2018 08:55:55 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 7c85e7ee6d7b080db3521ed824492f2d9d1deb45
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Aug 31 13:54:28 2018 +0200
gnu: Add gcc-mesboot-wrapper 4.7.4.
* gnu/packages/commencement.scm (gcc-mesboot-wrapper): New variable.
(%bootstrap-inputs+toolchain): Use it to replace gcc-mesboot. WIP
---
gnu/packages/commencement.scm | 49 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a113134..e0279cd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1350,6 +1350,52 @@ ac_cv_c_float_format='IEEE (little-endian)'
(zero?
(apply system* "../configure" configure-flags))))))))))
+(define-public gcc-mesboot-wrapper
+ (package-with-bootstrap-guile
+ (package
+ (inherit gcc-mesboot)
+ (name "gcc-mesboot-wrapper")
+ (source #f)
+ (inputs '())
+ (native-inputs `(("bash" ,%bootstrap-coreutils&co)
+ ("libc" ,%bootstrap-glibc)
+ ("gcc" ,gcc-mesboot)))
+ (arguments
+ `(#:implicit-inputs? #f
+ #:guile ,%bootstrap-guile
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'unpack)
+ (delete 'configure)
+ (delete 'install)
+ (replace 'build
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bash (assoc-ref %build-inputs "bash"))
+ (libc (assoc-ref %build-inputs "libc"))
+ (gcc (assoc-ref %build-inputs "gcc"))
+ (bin (string-append out "/bin"))
+ (program (string-append bin "/gcc")))
+ (mkdir-p bin)
+ (with-output-to-file program
+ (lambda _
+ (display (string-append "#! " bash "/bin/bash
+exec " gcc "/bin/gcc"
+" -Wl,--dynamic-linker"
+" -Wl," libc ,(glibc-dynamic-linker)
+" -Wl,--rpath"
+" -Wl," libc "/lib"
+" \"address@hidden"
+"))))
+ (chmod program #o555)
+ #t)))
+ (replace 'check
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (program (string-append bin "/gcc")))
+ (invoke program "--help"))))))))))
+
(define-public glibc-headers-mesboot
(package-with-bootstrap-guile
(package
@@ -1642,7 +1688,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
("i686-linux" `(;;("libc" ,glibc-mesboot) ; FIXME: make usable for
unpatched gnu-make-boot0, *-boot0
("libc" ,%bootstrap-glibc)
("binutils" ,binutils-mesboot)
- ("gcc" ,gcc-mesboot)))
+ ;; ("gcc" ,gcc-mesboot) ; FIXME: allow gcc to
use glibc
+ ("gcc" ,gcc-mesboot-wrapper)))
(_ '()))
%bootstrap-inputs))
- branch wip-bootstrap updated (622c80b -> 451fa0c), Jan Nieuwenhuizen, 2018/08/31
- 06/07: gnu: file-boot0: Do not strip binaries or validate-runpath., Jan Nieuwenhuizen, 2018/08/31
- 04/07: gnu: findutils-boot0: Export (for testing)., Jan Nieuwenhuizen, 2018/08/31
- 02/07: Revert "gnu: make-boot0: Set LOADLIBES for i686-linux.", Jan Nieuwenhuizen, 2018/08/31
- 01/07: gnu: Add gcc-mesboot-wrapper 4.7.4.,
Jan Nieuwenhuizen <=
- 03/07: gnu: diffutils-boot0: Export (for testing)., Jan Nieuwenhuizen, 2018/08/31
- 05/07: gnu: file-boot0: Export (for testing)., Jan Nieuwenhuizen, 2018/08/31
- 07/07: gnu: binutils-boot0: Export (for testing)., Jan Nieuwenhuizen, 2018/08/31