[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: build-system/gnu: Pass --build=<triplet> to configure by default.
From: |
Mark H. Weaver |
Subject: |
01/06: build-system/gnu: Pass --build=<triplet> to configure by default. |
Date: |
Mon, 13 Jul 2015 23:12:05 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 3c7d023d6458669c6bfa23bc85e098c91f699892
Author: Mark H Weaver <address@hidden>
Date: Mon Jul 13 18:54:40 2015 -0400
build-system/gnu: Pass --build=<triplet> to configure by default.
* 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.
---
guix/build-system/gnu.scm | 4 ++++
guix/build/gnu-build-system.scm | 5 ++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 8702c6c..1f30244 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -289,6 +289,7 @@ standard packages used as implicit inputs of the GNU build
system."
(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 @@ are allowed to refer to."
(source
source))
#:system ,system
+ #:build ,build
#:outputs %outputs
#:inputs %build-inputs
#:search-paths ',(map search-path-specification->sexp
@@ -422,6 +424,7 @@ is one of `host' or `target'."
(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 @@ platform."
(source
source))
#:system ,system
+ #:build ,build
#:target ,target
#:outputs %outputs
#:inputs %build-target-inputs
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 5062479..102207b 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -184,7 +184,7 @@ makefiles."
;; 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 @@ makefiles."
(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))
'())
- branch core-updates updated (f727ec5 -> 7a34576), Mark H. Weaver, 2015/07/13
- 03/06: gnu: xbindkeys: Remove --build from configure flags., Mark H. Weaver, 2015/07/13
- 02/06: gnu: gmp: Remove --build from configure-flags., Mark H. Weaver, 2015/07/13
- 04/06: gnu: sysfsutils-1: Remove --build from configure flags., Mark H. Weaver, 2015/07/13
- 01/06: build-system/gnu: Pass --build=<triplet> to configure by default.,
Mark H. Weaver <=
- 06/06: gnu: corkscrew: Pass triplet instead of system as --build and --host., Mark H. Weaver, 2015/07/13
- 05/06: gnu: liba52: Remove --build from configure flags., Mark H. Weaver, 2015/07/13