From b45a97ea84befd28b6191aa9ca320b8758ee8090 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Feb 2019 20:28:57 +0100 Subject: 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 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/build/cross-toolchain.scm') diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 0b5450d1b4..53d6d39187 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -169,16 +169,6 @@ (define* (cross-gcc-build-phases target (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))) -- cgit v1.2.3