[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/25: gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries.
From: |
Jan Nieuwenhuizen |
Subject: |
13/25: gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries. |
Date: |
Tue, 26 Jun 2018 13:48:37 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ccc5d3815b8164c906997ab1ff1a5a38df4a9b76
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sat Jun 23 14:28:55 2018 +0200
gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries.
* gnu/packages/mes.scm (binutils-boot0): Inject AR,LD from bootstrap
binaries.
---
gnu/packages/mes.scm | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 659f8f1..38ed202 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -39,7 +39,6 @@
#:use-module (guix gexp))
(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up?
-(define %cheat-binutils? #t) ; cheat using binutils-boot0 compiled with
current tool-chain
(define %mescc-tools-seed
(let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb"))
@@ -629,11 +628,10 @@ standard.")
(system* "./configure"
(string-append "--prefix=" out)))))))))))
-(define-public binutils-boot0-real
+(define-public binutils-boot0
(package
(inherit binutils)
- (name (if %cheat-binutils? "binutils-boot0-real"
- "binutils-boot0"))
+ (name "binutils-boot0")
(version "2.20.1a")
(source (origin
(method url-fetch)
@@ -704,15 +702,20 @@ standard.")
"--disable-werror"
"--host=i386-unknown-linux"
"--target=i386-unknown-linux"
- (string-append "--prefix=" out))))))))))))
+ (string-append "--prefix=" out)))))))
+ (add-after 'build 'cheat:inject-AR,LD
+ (lambda* _
+ (let ((binutils (assoc-ref %build-inputs "binutils")))
+ ;; cheat: AR and LD are buggy in bootstrap build
+ (copy-file (string-append binutils "/bin/ar") "binutils/ar")
+ (copy-file (string-append binutils "/bin/ld")
"ld/ld-new")))))))))
(define-public binutils-boot0-cheat
(let* ((triplet "i686-unknown-linux-gnu")
(tool-prefix (string-append triplet "-")))
(package
(inherit binutils-boot0-real)
- (name (if %cheat-binutils? "binutils-boot0"
- "binutils-boot0-cheat"))
+ (name "binutils-boot0-cheat")
(supported-systems '("i686-linux"))
(native-inputs `(("flex" ,flex) ; cheat
("binutils" ,(cross-binutils triplet))
@@ -788,13 +791,9 @@ standard.")
"--target=i386-unknown-linux"
(string-append "--prefix="
out)))))))))))))
-(define-public binutils-boot0
- (if %cheat-binutils? binutils-boot0-cheat
- binutils-boot0-real))
-
(define-public binutils-boot
(package
- (inherit binutils-boot0-real)
+ (inherit binutils-boot0)
(name "binutils-boot")
(native-inputs `(("flex" ,flex) ; cheat
("glibc" ,glibc-boot)
- branch wip-bootstrap updated (e428d5e -> 0f46768), Jan Nieuwenhuizen, 2018/06/26
- 01/25: gnu: mes-boot: Update for fopen: Return 0 upon failure., Jan Nieuwenhuizen, 2018/06/26
- 03/25: gnu: mes-boot: Update to 0.16., Jan Nieuwenhuizen, 2018/06/26
- 04/25: gnu: %tinycc-seed: Update for mes 0.16., Jan Nieuwenhuizen, 2018/06/26
- 02/25: gnu: %mes-seed: Update for mes 0.16., Jan Nieuwenhuizen, 2018/06/26
- 09/25: gnu: tcc-boot0: Update for mes 0.16., Jan Nieuwenhuizen, 2018/06/26
- 07/25: gnu: Add binutils-boot 2.20.1, built with gcc+glibc., Jan Nieuwenhuizen, 2018/06/26
- 13/25: gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries.,
Jan Nieuwenhuizen <=
- 16/25: gnu: binutils-mesboot0: Rename from binutils-boot0., Jan Nieuwenhuizen, 2018/06/26
- 21/25: Revert: gnu: binutils-boot0: Inject AR, LD from bootstrap-binaries., Jan Nieuwenhuizen, 2018/06/26
- 11/25: gnu: Add binutils-boot0-cheat., Jan Nieuwenhuizen, 2018/06/26
- 19/25: gnu: gcc-mesboot: Rename from gcc-boot., Jan Nieuwenhuizen, 2018/06/26
- 17/25: gnu: gcc-core-mesboot: Rename from gcc-core-boot., Jan Nieuwenhuizen, 2018/06/26
- 18/25: gnu: glibc-mesboot: Rename from glibc-boot., Jan Nieuwenhuizen, 2018/06/26
- 15/25: gnu: m4:mesboot: Rename from m4-boot., Jan Nieuwenhuizen, 2018/06/26
- 14/25: gnu: Remove binutils-boot0-cheat., Jan Nieuwenhuizen, 2018/06/26
- 23/25: gnu: Add gcc-mesboot 4.7.4. WIP, Jan Nieuwenhuizen, 2018/06/26
- 24/25: REMOVEME: %fake-bootstrap => #t., Jan Nieuwenhuizen, 2018/06/26