ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags.

Browse source 
* 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.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
John Darrington 2013-12-17 20:33:26 +01:00 committed by Ludovic Courtès
parent f22e0e264e
commit db6190899e
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/gnupg.scm
View file

@ -44,10 +44,6 @@ (define-public libgpg-error
(base32 (base32
"0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a")))) "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
(if (%current-target-system)
'(#:configure-flags '("CC_FOR_BUILD=gcc"))
'()))
(home-page "http://gnupg.org") (home-page "http://gnupg.org")
(synopsis (synopsis
"Libgpg-error, a small library that defines common error values for all GnuPG components") "Libgpg-error, a small library that defines common error values for all GnuPG components")

6
gnu/packages/guile.scm
View file

@ -150,11 +150,7 @@ (define-public guile-2.0
(substitute* "module/ice-9/popen.scm" (substitute* "module/ice-9/popen.scm"
(("/bin/sh") (("/bin/sh")
(string-append bash "/bin/bash"))))) (string-append bash "/bin/bash")))))
%standard-phases) %standard-phases)))
,@(if (%current-target-system)
'(#:configure-flags '("CC_FOR_BUILD=gcc"))
'())))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification

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

@ -502,10 +502,7 @@ (define %guile-static
`(;; When `configure' checks for ltdl availability, it `(;; When `configure' checks for ltdl availability, it
;; doesn't try to link using libtool, and thus fails ;; doesn't try to link using libtool, and thus fails
;; because of a missing -ldl. Work around that. ;; because of a missing -ldl. Work around that.
#:configure-flags '("LDFLAGS=-ldl" #:configure-flags '("LDFLAGS=-ldl")
,@(if (%current-target-system)
'("CC_FOR_BUILD=gcc")
'()))
#:phases (alist-cons-before #:phases (alist-cons-before
'configure 'static-guile 'configure 'static-guile

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

@ -136,7 +136,10 @@ (define (package-name)
(bash (or (and=> (assoc-ref (or native-inputs inputs) "bash") (bash (or (and=> (assoc-ref (or native-inputs inputs) "bash")
(cut string-append <> "/bin/bash")) (cut string-append <> "/bin/bash"))
"/bin/sh")) "/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 "SHELL=" bash)
,(string-append "--prefix=" prefix) ,(string-append "--prefix=" prefix)
"--enable-fast-install" ; when using Libtool "--enable-fast-install" ; when using Libtool