[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
168/192: gnu: gcc-mesboot-wrapper: Wrap g++ too.
From: |
Jan Nieuwenhuizen |
Subject: |
168/192: gnu: gcc-mesboot-wrapper: Wrap g++ too. |
Date: |
Mon, 3 Sep 2018 16:25:21 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 3b2e43fa0a73b03c5015fe38d4f402997100eb7e
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Aug 31 15:26:20 2018 +0200
gnu: gcc-mesboot-wrapper: Wrap g++ too.
* gnu/packages/commencement.scm (gcc-mesboot-wrapper): Wrap g++ too.
---
gnu/packages/commencement.scm | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 99f4c7e..3642c00 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1374,20 +1374,23 @@ ac_cv_c_float_format='IEEE (little-endian)'
(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")))
+ (bin (string-append out "/bin")))
(mkdir-p bin)
- (with-output-to-file program
- (lambda _
- (display (string-append "#! " bash "/bin/bash
-exec " gcc "/bin/gcc"
+ (for-each
+ (lambda (program)
+ (let ((wrapper (string-append bin "/" program)))
+ (with-output-to-file wrapper
+ (lambda _
+ (display (string-append "#! " bash "/bin/bash
+exec " gcc "/bin/" program
" -Wl,--dynamic-linker"
" -Wl," libc ,(glibc-dynamic-linker)
" -Wl,--rpath"
" -Wl," libc "/lib"
" \"address@hidden"
-"))))
- (chmod program #o555)
+"))
+ (chmod wrapper #o555)))))
+ '("gcc" "g++"))
#t)))
(replace 'check
(lambda* (#:key outputs #:allow-other-keys)
- 159/192: gcc-mesboot: use package-full-name "-" :-), (continued)
- 159/192: gcc-mesboot: use package-full-name "-" :-), Jan Nieuwenhuizen, 2018/09/03
- 170/192: gnu: make-mesboot: Update to 3.82., Jan Nieuwenhuizen, 2018/09/03
- 166/192: gnu: file-boot0: Do not strip binaries or validate-runpath., Jan Nieuwenhuizen, 2018/09/03
- 169/192: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time., Jan Nieuwenhuizen, 2018/09/03
- 181/192: gnu: diffutils-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 140/192: gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball., Jan Nieuwenhuizen, 2018/09/03
- 149/192: gnu: tcc-boot: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/03
- 143/192: gnu: Add %bootstrap-linux-libre-headers., Jan Nieuwenhuizen, 2018/09/03
- 155/192: Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball.", Jan Nieuwenhuizen, 2018/09/03
- 165/192: Revert "gnu: make-boot0: Set LOADLIBES for i686-linux.", Jan Nieuwenhuizen, 2018/09/03
- 168/192: gnu: gcc-mesboot-wrapper: Wrap g++ too.,
Jan Nieuwenhuizen <=
- 172/192: copy-linux-headers: Update for glibc-2.16.0., Jan Nieuwenhuizen, 2018/09/03
- 171/192: %bootstrap-linux-libre-headers: Update, Jan Nieuwenhuizen, 2018/09/03
- 178/192: gnu: tcc-boot0: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 120/192: gnu: mes-boot: Update to 0.16.1; revise dependencies., Jan Nieuwenhuizen, 2018/09/03
- 118/192: gnu: mescc-tools-boot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/03
- 121/192: gnu: tcc-boot0: Revise dependencies., Jan Nieuwenhuizen, 2018/09/03
- 139/192: gnu: Add %bootstrap-make., Jan Nieuwenhuizen, 2018/09/03
- 133/192: bootstrap: Move mes seeds to bootstrap.scm, Jan Nieuwenhuizen, 2018/09/03
- 132/192: gnu: tcc-boot0: Update for mes 0.17., Jan Nieuwenhuizen, 2018/09/03
- 134/192: gnu: mescc-tools-boot: Use gnu-build-system., Jan Nieuwenhuizen, 2018/09/03