From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH] gnu: gnu-build-system: Add CC_FOR_BUILD to configure flags. Date: Tue, 17 Dec 2013 20:33:26 +0100 Message-ID: <1387308806-5705-2-git-send-email-jmd@gnu.org> References: <1387308806-5705-1-git-send-email-jmd@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vt0Ot-0000yD-Nk for guix-devel@gnu.org; Tue, 17 Dec 2013 14:33:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vt0Oo-0004qY-QY for guix-devel@gnu.org; Tue, 17 Dec 2013 14:33:51 -0500 Received: from de.cellform.com ([88.217.224.109]:51530 helo=jocasta.intra) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vt0Oo-0004qS-0X for guix-devel@gnu.org; Tue, 17 Dec 2013 14:33:46 -0500 In-Reply-To: <1387308806-5705-1-git-send-email-jmd@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org From: John Darrington * 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