janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 3b2e43fa0a73b03c5015fe38d4f402997100eb7e
Author: Jan Nieuwenhuizen <[email protected]>
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"
" \"$@\"
-"))))
- (chmod program #o555)
+"))
+ (chmod wrapper #o555)))))
+ '("gcc" "g++"))
#t)))
(replace 'check
(lambda* (#:key outputs #:allow-other-keys)
