janneke pushed a commit to branch wip-bootstrap in repository guix. commit cf580ef33d551293bd23418cbd5e74119ecba2d3 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sat Sep 8 13:03:56 2018 +0200
gnu: bison-boot0: Remove bootstrap leaks. * gnu/packages/commencement.scm (bison-boot0): Remove bootstrap leaks. Avoid ranlib -D. AFAICS there is no such flag in binutils-cross-boot0's ranlib. --- gnu/packages/commencement.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 964682a..aa2a766 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1938,23 +1938,25 @@ exec " gcc "/bin/" program ;; This Bison is needed to build MiG so we need it early in the process. ;; It is also needed to rebuild Bash's parser, which is modified by ;; its CVE patches. Remove it when it's no longer needed. - (let ((bison (package (inherit bison) - (propagated-inputs `(("m4" ,m4-boot0))) - (inputs '()) ;remove Flex... - (arguments - '(#:tests? #f ;... and thus disable tests - - ;; Zero timestamps in liby.a; this must be done - ;; explicitly here because the bootstrap Binutils don't - ;; do that (default is "cru".) - #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D" - "V=1")))))) - (package - (inherit (package-with-bootstrap-guile - (package-with-explicit-inputs bison (%boot0-inputs) - (current-source-location) - #:guile %bootstrap-guile))) - (native-inputs `(("perl" ,perl-boot0)))))) + (package-with-bootstrap-guile + (package + (inherit bison) + (propagated-inputs `(("m4" ,m4-boot0))) + (inputs (%boot0-inputs)) ;remove Flex... + (native-inputs `(("perl" ,perl-boot0))) + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + #:tests? #f ;... and thus disable tests + ;; Zero timestamps in liby.a; this must be done + ;; explicitly here because the bootstrap Binutils don't + ;; do that (default is "cru".) + #:make-flags `("ARFLAGS=crD" + ,,(match (%current-system) + ;; ranlib: '-D': No such file + ("i686-linux" "RANLIB=ranlib") + (_ "RANLIB=ranlib -D")) + "V=1")))))) (define flex-boot0 ;; This Flex is needed to build MiG.