janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit e3ae1c5e019a1898c4ab22ac6c450594785a1b2d
Author: Jan Nieuwenhuizen <[email protected]>
Date: Tue Aug 28 23:12:59 2018 +0200
gnu: make-boot0: Set LOADLIBES for i686-linux.
* gnu/packages/commencement.scm (gnu-make-boot0): Set LOADLIBES for
i686-linux.
---
gnu/packages/commencement.scm | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4fa26c3..dd41025 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1398,16 +1398,24 @@ ac_cv_c_float_format='IEEE (little-endian)'
,@(substitute-keyword-arguments (package-arguments gnu-make)
((#:phases phases)
`(modify-phases ,phases
- (replace 'build
- (lambda _
- (invoke "./build.sh")
- #t))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (install-file "make" bin)
- #t))))))))
+ ,@(append
+ (match (%current-system)
+ ("i686-linux"
+ '((add-before 'build 'configure-fixup
+ (lambda _
+ (substitute* "build.sh"
+ (("^LOADLIBES=.*") "LOADLIBES='-ldl -lc
-lnss_files -lnss_dns -lresolv'\n"))))))
+ (_ '()))
+ '((replace 'build
+ (lambda _
+ (invoke "./build.sh")
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (install-file "make" bin)
+ #t))))))))))
(native-inputs '()) ; no need for 'pkg-config'
(inputs %bootstrap-inputs+toolchain))))
