[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: GCC: Move cross-toolchain build fix to (gnu packages cross-b
From: |
guix-commits |
Subject: |
03/05: gnu: GCC: Move cross-toolchain build fix to (gnu packages cross-base). |
Date: |
Thu, 28 Feb 2019 14:22:59 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit b45a97ea84befd28b6191aa9ca320b8758ee8090
Author: Marius Bakke <address@hidden>
Date: Wed Feb 27 20:28:57 2019 +0100
gnu: GCC: Move cross-toolchain build fix to (gnu packages cross-base).
This makes sure it is inherited by packages using (cross-gcc ...). This
commit is a followup to 01e8263febb9634564b4b73af49b81a36567a11b.
* gnu/build/cross-toolchain.scm (cross-gcc-build-phases): Move
'treat-glibc-as-system-header' phase ...
* gnu/packages/cross-base.scm (cross-gcc-arguments): ... here.
---
gnu/build/cross-toolchain.scm | 10 ----------
gnu/packages/cross-base.scm | 15 ++++++++++++++-
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm
index 0b5450d..53d6d39 100644
--- a/gnu/build/cross-toolchain.scm
+++ b/gnu/build/cross-toolchain.scm
@@ -169,16 +169,6 @@ a target triplet."
(if (string-contains target "mingw")
set-cross-path/mingw
set-cross-path))
- (add-before 'configure 'treat-glibc-as-system-header
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((libc (assoc-ref inputs "libc")))
- (when libc
- ;; For GCC6 and later, make sure Glibc is treated as a "system
- ;; header" such that #include_next does the right thing.
- (for-each (lambda (var)
- (setenv var (string-append libc "/include")))
- '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH")))
- #t)))
(add-after 'install 'make-cross-binutils-visible
(cut make-cross-binutils-visible #:target target <...>))
(replace 'install install-strip)))
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 8fe9d5b..6a09272 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -165,7 +166,19 @@ base compiler and using LIBC (which may be either a libc
package or #f.)"
,flags))
flags))
((#:phases phases)
- `(cross-gcc-build-phases ,target ,phases))))))
+ `(cross-gcc-build-phases
+ ,target
+ (modify-phases ,phases
+ (add-before 'configure 'treat-glibc-as-system-header
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libc (assoc-ref inputs "libc")))
+ (when libc
+ ;; For GCC6 and later, make sure Glibc is treated as a
"system
+ ;; header" such that #include_next does the right thing.
+ (for-each (lambda (var)
+ (setenv var (string-append libc "/include")))
+ '("CROSS_C_INCLUDE_PATH"
"CROSS_CPLUS_INCLUDE_PATH")))
+ #t))))))))))
(define (cross-gcc-patches target)
"Return GCC patches needed for TARGET."