[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: gnu: gcc: Use 'gcc-configure-flags-for-triplet' for native builds
From: |
Mark H. Weaver |
Subject: |
05/08: gnu: gcc: Use 'gcc-configure-flags-for-triplet' for native builds. |
Date: |
Fri, 02 Jan 2015 22:13:36 +0000 |
mhw pushed a commit to branch wip-armhf
in repository guix.
commit cc03d21e740f782e0c9412b17d04f8985af800e8
Author: Mark H Weaver <address@hidden>
Date: Wed Dec 31 03:58:58 2014 -0500
gnu: gcc: Use 'gcc-configure-flags-for-triplet' for native builds.
* gnu/packages/gcc.scm (gcc-4.7)[configure-flags]: Include result of
'gcc-configure-flags-for-triplet'.
(gcc-configure-flags-for-triplet): No longer export it.
* gnu/packages/cross-base.scm (cross-gcc-arguments): No longer include
result of 'gcc-configure-flags-for-triplet', since the base gcc packages
now include it.
---
gnu/packages/cross-base.scm | 1 -
gnu/packages/gcc.scm | 13 +++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 0f32c9f..a9ae5ee 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -88,7 +88,6 @@ may be either a libc package or #f.)"
(substitute-keyword-arguments (package-arguments gcc-4.8)
((#:configure-flags flags)
`(append (list ,(string-append "--target=" target)
- ,@(gcc-configure-flags-for-triplet target)
,@(if libc
'()
`( ;; Disable features not needed at this stage.
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index d8fd885..e6e4905 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,7 @@
;; Base URL for GCC's infrastructure.
"ftp://gcc.gnu.org/pub/gcc/infrastructure/")
-(define-public (gcc-configure-flags-for-triplet target)
+(define (gcc-configure-flags-for-triplet target)
"Return a list of additional GCC `configure' flags for TARGET, a GNU triplet.
The purpose of this procedure is to translate extended GNU triplets---e.g.,
@@ -101,11 +102,11 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
"/include")
"--without-headers")))
- ;; When cross-compiling GCC, pass the right options for the
- ;; target triplet.
- (or (and=> (%current-target-system)
- gcc-configure-flags-for-triplet)
- '())
+ ;; Pass the right options for the target triplet.
+ (let ((triplet
+ (or (%current-target-system)
+ (nix-system->gnu-triplet (%current-system)))))
+ (gcc-configure-flags-for-triplet triplet))
(maybe-target-tools))))))
(package
- branch wip-armhf created (now d3cdb58), Mark H. Weaver, 2015/01/02
- 02/08: gnu: bootstrap: Fix egrep and fgrep after unpacking bootstrap binaries., Mark H. Weaver, 2015/01/02
- 01/08: gnu: bootstrap: Add support for snippets to 'package-from-tarball'., Mark H. Weaver, 2015/01/02
- 03/08: Move 'nix-system->gnu-triplet' to (guix utils) and export it., Mark H. Weaver, 2015/01/02
- 04/08: gnu: gcc-static: Remove -lgcc_s from GNU_USER_TARGET_LIB_SPEC., Mark H. Weaver, 2015/01/02
- 05/08: gnu: gcc: Use 'gcc-configure-flags-for-triplet' for native builds.,
Mark H. Weaver <=
- 06/08: gnu: gmp: Apply fixes for armhf., Mark H. Weaver, 2015/01/02
- 07/08: gnu: guile: Apply fixes for arm., Mark H. Weaver, 2015/01/02
- 08/08: gnu: Add support for the 'armhf-linux' system., Mark H. Weaver, 2015/01/02