diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-27 20:28:57 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-28 19:15:02 +0100 |
| commit | b45a97ea84befd28b6191aa9ca320b8758ee8090 (patch) | |
| tree | 2d2237c10a0a7a345ac49d41115d97bde48912c3 /gnu/build/cross-toolchain.scm | |
| parent | b4037d82c0d30455ca9288e18a543dbb310476ac (diff) | |
| download | guix-b45a97ea84befd28b6191aa9ca320b8758ee8090.tar guix-b45a97ea84befd28b6191aa9ca320b8758ee8090.tar.gz | |
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.
Diffstat (limited to 'gnu/build/cross-toolchain.scm')
| -rw-r--r-- | gnu/build/cross-toolchain.scm | 10 |
1 files changed, 0 insertions, 10 deletions
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 @@ 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))) |