janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 12d57058dcbc7f3e2c4d9debbd42ee29ab7e3a2b
Author: Jan Nieuwenhuizen <[email protected]>
Date: Fri Aug 31 14:19:46 2018 +0200
Revert "gnu: make-boot0: Set LOADLIBES for i686-linux."
This reverts commit 8e1977169c1bdb1236c147c93bdfe2ac77c91bd5.
---
gnu/packages/commencement.scm | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 20d6639..0d44ee1 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1705,24 +1705,16 @@ exec " gcc "/bin/gcc"
,@(substitute-keyword-arguments (package-arguments gnu-make)
((#:phases phases)
`(modify-phases ,phases
- ,@(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))))))))))
+ (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))))
