* [PATCH] gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags.
@ 2013-12-17 19:33 John Darrington
2013-12-17 19:33 ` John Darrington
0 siblings, 1 reply; 3+ messages in thread
From: John Darrington @ 2013-12-17 19:33 UTC (permalink / raw)
To: guix-devel
This patch adds the CC_FOR_BUILD=gcc flag to the gnu-build-system and removes
it from the individual packages which had it set. There were only 3 such
packages, but there is at least one other which needed it.
Since this causes a core rebuild Ludovic will probably want it on a separate
branch.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags.
2013-12-17 19:33 [PATCH] gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags John Darrington
@ 2013-12-17 19:33 ` John Darrington
2013-12-17 20:29 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: John Darrington @ 2013-12-17 19:33 UTC (permalink / raw)
To: guix-devel
From: John Darrington <john@darrington.wattle.id.au>
* guix/build/gnu-build-system.scm: Add new configure flag: CC_FOR_BUILD=gcc
* gnu/packages/gnupg.scm, gnu/packages/guile.scm, gnu/packages/make-bootstrap.scm:
remove CC_FOR_BUILD from these package descriptions.
---
gnu/packages/gnupg.scm | 4 ----
gnu/packages/guile.scm | 6 +-----
gnu/packages/make-bootstrap.scm | 5 +----
guix/build/gnu-build-system.scm | 5 ++++-
4 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 34469a2..de6af23 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -44,10 +44,6 @@
(base32
"0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"))))
(build-system gnu-build-system)
- (arguments
- (if (%current-target-system)
- '(#:configure-flags '("CC_FOR_BUILD=gcc"))
- '()))
(home-page "http://gnupg.org")
(synopsis
"Libgpg-error, a small library that defines common error values for all GnuPG components")
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 40d9ae7..3dbb5d8 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -150,11 +150,7 @@ without requiring the source code to be rewritten.")
(substitute* "module/ice-9/popen.scm"
(("/bin/sh")
(string-append bash "/bin/bash")))))
- %standard-phases)
-
- ,@(if (%current-target-system)
- '(#:configure-flags '("CC_FOR_BUILD=gcc"))
- '())))
+ %standard-phases)))
(native-search-paths
(list (search-path-specification
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index d621a63..97a13b4 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -502,10 +502,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
`(;; When `configure' checks for ltdl availability, it
;; doesn't try to link using libtool, and thus fails
;; because of a missing -ldl. Work around that.
- #:configure-flags '("LDFLAGS=-ldl"
- ,@(if (%current-target-system)
- '("CC_FOR_BUILD=gcc")
- '()))
+ #:configure-flags '("LDFLAGS=-ldl")
#:phases (alist-cons-before
'configure 'static-guile
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 65c9fcd..6d26392 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -136,7 +136,10 @@ makefiles."
(bash (or (and=> (assoc-ref (or native-inputs inputs) "bash")
(cut string-append <> "/bin/bash"))
"/bin/sh"))
- (flags `(,(string-append "CONFIG_SHELL=" bash)
+ (flags `(,@(if target ; cross building
+ '("CC_FOR_BUILD=gcc")
+ '())
+ ,(string-append "CONFIG_SHELL=" bash)
,(string-append "SHELL=" bash)
,(string-append "--prefix=" prefix)
"--enable-fast-install" ; when using Libtool
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags.
2013-12-17 19:33 ` John Darrington
@ 2013-12-17 20:29 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2013-12-17 20:29 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <jmd@gnu.org> skribis:
> * guix/build/gnu-build-system.scm: Add new configure flag: CC_FOR_BUILD=gcc
>
> * gnu/packages/gnupg.scm, gnu/packages/guile.scm, gnu/packages/make-bootstrap.scm:
> remove CC_FOR_BUILD from these package descriptions.
Applied to the just-reopened ‘core-updates’ branch, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-17 20:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-17 19:33 [PATCH] gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags John Darrington
2013-12-17 19:33 ` John Darrington
2013-12-17 20:29 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.