janneke pushed a commit to branch wip-bootstrap in repository guix. commit 43c84aadfc9da0b6672e377b2f15d58405f5b068 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Mon Sep 3 11:03:03 2018 +0200
gnu: make-mesboot0: Cleanup. * gnu/packages/commencement.scm (make-mesboot0): Cleanup. --- gnu/packages/commencement.scm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8188333..2e06e20 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -586,24 +586,11 @@ `(#:implicit-inputs? #f #:tests? #f ; check depends on perl #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:configure-flags `("CC=tcc -DO_RDONLY=0" + "LD=tcc" + "--disable-nls") #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (unsetenv "C_INCLUDE_PATH") - (unsetenv "LIBRARY_PATH") - (setenv "CONFIG_SHELL" (string-append - (assoc-ref %build-inputs "bash") - "/bin/sh")) - (setenv "CC" "tcc -g -static -DO_RDONLY=0") - (setenv "LD" "tcc -g -static") - (format (current-error-port) "PATH=~a\n" (getenv "PATH")) - (zero? - (system* "./configure" - (string-append "--prefix=" out) - "--disable-nls"))))) (add-after 'configure 'configure-fixup (lambda _ (substitute* "build.sh" @@ -615,7 +602,7 @@ (delete 'patch-generated-file-shebangs) ; no perl (replace 'build (lambda _ - (zero? (system* "sh" "./build.sh")))) + (invoke "sh" "./build.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))