ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootstrap: Force i686-linux for bootstrap-tarballs.

Browse source 
* 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.
This commit is contained in:
Jan Nieuwenhuizen 2018-11-20 08:12:09 +01:00
parent d9ed0a4630
commit da91723cc5
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/commencement.scm
View file

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

19
gnu/packages/make-bootstrap.scm
View file

@ -542,9 +542,10 @@ (define %mescc-tools-static
(inherit mescc-tools) (inherit mescc-tools)
(name "mescc-tools-static") (name "mescc-tools-static")
(arguments (arguments
(substitute-keyword-arguments (package-arguments mescc-tools) `(#:system "i686-linux"
((#:make-flags flags) ,@(substitute-keyword-arguments (package-arguments mescc-tools)
`(cons "CC=gcc -static" ,flags)))))) ((#:make-flags flags)
`(cons "CC=gcc -static" ,flags)))))))
(define %mes-minimal (define %mes-minimal
;; A minimal Mes without documentation dependencies, for bootstrap. ;; A minimal Mes without documentation dependencies, for bootstrap.
@ -553,16 +554,10 @@ (define %mes-minimal
(inherit mes) (inherit mes)
(name "mes-minimal") (name "mes-minimal")
(native-inputs (native-inputs
`(("guile" ,guile-2.2) `(("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)))
'())))
(arguments (arguments
`(#:strip-binaries? #f `(#:system "i686-linux"
#:strip-binaries? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'optional-dot (add-before 'configure 'optional-dot