janneke pushed a commit to branch wip-bootstrap in repository guix. commit 1bd78b8dd9ff1bc99e1abbeb2967e5644f88184c Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Mon Sep 3 16:11:55 2018 +0200
gnu: make-mesboot: Cleanup. * gnu/packages/commencement.scm (make-mesboot): Cleanup. --- gnu/packages/commencement.scm | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d287e77..eac65a3 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1073,23 +1073,17 @@ ac_cv_c_float_format='IEEE (little-endian)' ("coreutils" ,%bootstrap-coreutils&co) ("kernel-headers" ,%bootstrap-linux-libre-headers))) (arguments - `(#:implicit-inputs? #f - #:parallel-build? #f - #:tests? #f ; check depends on perl - #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries - #:phases - (modify-phases %standard-phases - ;; https://gcc.gnu.org/ml/gcc/1998-12/msg00083.html 2.22 - (add-before 'configure 'setenv - (lambda _ - (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv"))) - (delete 'patch-generated-file-shebangs) ; no perl - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "make" bin)))))))))) + `(,@(substitute-keyword-arguments (package-arguments make-mesboot0) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out"))) + `(,(string-append "--prefix=" out)))) + ((#:phases phases) + `(modify-phases ,phases + (delete 'configure-fixup) + (add-before 'configure 'setenv + (lambda _ + (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") + #f)))))))))) (define gmp-boot (package