Browse Source

bootstrap: Force i686-linux for bootstrap-tarballs.

* gnu/packages/make-bootstrap.scm (%mescc-tools-static): Force i686-linux for
bootstrap-tarballs.
(%mes-minimal): Likewise.  Remove i686-linux cross-compiler dependency.
* gnu/packages/commencement.scm (mes-boot): Support strict i686-linux build on
x86_64.
gn-latest-20200725
Jan Nieuwenhuizen 3 years ago
parent
commit
da91723cc5
No known key found for this signature in database GPG Key ID: F3C1A0D9C1D65273
  1. 2
      gnu/packages/commencement.scm
  2. 19
      gnu/packages/make-bootstrap.scm

2
gnu/packages/commencement.scm

@ -174,6 +174,8 @@
(symlink (string-append "../nyacc-source/module") "nyacc")
(setenv "GUILE_LOAD_PATH" "nyacc")
(setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile
(substitute* "configure.sh"
(("^arch=.*") "arch=i686\n"))
(invoke "bash" "configure.sh"
(string-append "--prefix=" out))
(setenv "MES" "src/mes")

19
gnu/packages/make-bootstrap.scm

@ -542,9 +542,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(inherit mescc-tools)
(name "mescc-tools-static")
(arguments
(substitute-keyword-arguments (package-arguments mescc-tools)
((#:make-flags flags)
`(cons "CC=gcc -static" ,flags))))))
`(#:system "i686-linux"
,@(substitute-keyword-arguments (package-arguments mescc-tools)
((#:make-flags flags)
`(cons "CC=gcc -static" ,flags)))))))
(define %mes-minimal
;; A minimal Mes without documentation dependencies, for bootstrap.
@ -553,16 +554,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(inherit mes)
(name "mes-minimal")
(native-inputs
`(("guile" ,guile-2.2)
,@(if (not (string-prefix? "i686-linux" (or (%current-target-system)
(%current-system))))
;; Use cross-compiler rather than #:system "i686-linux" to get
;; MesCC 64 bit .go files installed ready for use with Guile.
`(("i686-linux-binutils" ,(cross-binutils triplet))
("i686-linux-gcc" ,(cross-gcc triplet)))
'())))
`(("guile" ,guile-2.2)))
(arguments
`(#:strip-binaries? #f
`(#:system "i686-linux"
#:strip-binaries? #f
#:phases
(modify-phases %standard-phases
(add-before 'configure 'optional-dot

Loading…
Cancel
Save