[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
168/211: gnu: gcc-mesboot-wrapper: Wrap g++ too.
From: |
Jan Nieuwenhuizen |
Subject: |
168/211: gnu: gcc-mesboot-wrapper: Wrap g++ too. |
Date: |
Sat, 8 Sep 2018 11:09:50 -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)
- 186/211: gnu: gcc-mesboot0: Cleanup., (continued)
- 186/211: gnu: gcc-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 175/211: gnu: glibc-mesboot: Remove %bootstrap-glibc., Jan Nieuwenhuizen, 2018/09/08
- 187/211: gnu: make-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 178/211: gnu: tcc-boot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 164/211: gnu: Add gcc-mesboot-wrapper 4.7.4., Jan Nieuwenhuizen, 2018/09/08
- 167/211: gnu: gcc-mesboot: Enable c++ too., Jan Nieuwenhuizen, 2018/09/08
- 152/211: gnu: make-mesboot: Update to 3.80., Jan Nieuwenhuizen, 2018/09/08
- 144/211: gnu: bootstrap-tarballs: Update inputs for i686-linux., Jan Nieuwenhuizen, 2018/09/08
- 91/211: gnu: gcc-core-boot: Install libgcc2.a too., Jan Nieuwenhuizen, 2018/09/08
- 151/211: gnu: Add diffutils-mesboot 2.7., Jan Nieuwenhuizen, 2018/09/08
- 168/211: gnu: gcc-mesboot-wrapper: Wrap g++ too.,
Jan Nieuwenhuizen <=
- 200/211: gnu: findutils-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 176/211: mescc-tools-boot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 166/211: gnu: file-boot0: Do not strip binaries or validate-runpath., Jan Nieuwenhuizen, 2018/09/08
- 124/211: gnu: gcc-core-mesboot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/08
- 161/211: gnu: make-boot0: Set LOADLIBES for i686-linux., Jan Nieuwenhuizen, 2018/09/08
- 97/211: gnu: gcc-boot: build with %cheat-binutils?, Jan Nieuwenhuizen, 2018/09/08
- 107/211: gnu: Add gcc-mesboot 4.1.0., Jan Nieuwenhuizen, 2018/09/08
- 156/211: Revert "gnu: Add %bootstrap-make.", Jan Nieuwenhuizen, 2018/09/08
- 149/211: gnu: tcc-boot: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/08
- 148/211: gnu: mes-boot: Update to 0.17.1., Jan Nieuwenhuizen, 2018/09/08