TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build-system/gnu: Pass --build=<triplet> to configure by default.

Browse source 
* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Accept #:build
  keyword argument.  Pass it to 'gnu-build' on the build side.
* guix/build/gnu-build-system.scm (configure): Accept #:build keyword
  argument.  Unless it is false, pass --build to configure.
This commit is contained in:
Mark H Weaver 2015-07-13 18:54:40 -04:00
parent f727ec5bc8
commit 3c7d023d64
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/build-system/gnu.scm
View file

@ -289,6 +289,7 @@ (define* (gnu-build store name input-drvs
(phases '%standard-phases)
(locale "en_US.UTF-8")
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules)
(modules %default-modules)
(substitutable? #t)
@ -333,6 +334,7 @@ (define builder
(source
source))
#:system ,system
#:build ,build
#:outputs %outputs
#:inputs %build-inputs
#:search-paths ',(map search-path-specification->sexp
@ -422,6 +424,7 @@ (define* (gnu-cross-build store name
(phases '%standard-phases)
(locale "en_US.UTF-8")
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules)
(modules %default-modules)
(substitutable? #t)
@ -472,6 +475,7 @@ (define %build-target-inputs
(source
source))
#:system ,system
#:build ,build
#:target ,target
#:outputs %outputs
#:inputs %build-target-inputs

5
guix/build/gnu-build-system.scm
View file

@ -184,7 +184,7 @@ (define (patch-generated-file-shebangs . rest)
;; Patch `SHELL' in generated makefiles.
(for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$")))
(define* (configure #:key target native-inputs inputs outputs
(define* (configure #:key build target native-inputs inputs outputs
(configure-flags '()) out-of-source?
#:allow-other-keys)
(define (package-name)
@ -234,6 +234,9 @@ (define (package-name)
(list (string-append "--docdir=" docdir
"/share/doc/" (package-name)))
'())
,@(if build
(list (string-append "--build=" build))
'())
,@(if target ; cross building
(list (string-append "--host=" target))
'())