mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: gcc-arm-none-eabi@7-2018-q2-update: Fix conflicting GCC headers.
This is a follow-up of 7f6d3f3950
and merely
a copy-and-paste of Marius Bakke's fix.
* gnu/packages/embedded.scm (gcc-arm-none-eabi-7-2018-q2-update)[arguments]:
Add phase to remove the default compiler from CPLUS_INCLUDE_PATH.
[native-inputs]: Distinguish GCC-5.
This commit is contained in:
parent
99f2c93470
commit
f6ec9f9d39
1 changed files with 18 additions and 2 deletions
|
@ -6,6 +6,7 @@
|
|||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -250,7 +251,7 @@ (define-public gcc-arm-none-eabi-7-2018-q2-update
|
|||
(origin-patches (package-source gcc-7))
|
||||
(search-patches "gcc-7-cross-environment-variables.patch")))))
|
||||
(native-inputs
|
||||
`(("gcc" ,gcc-5)
|
||||
`(("gcc@5" ,gcc-5)
|
||||
("flex" ,flex)
|
||||
("isl" ,isl-0.18)
|
||||
,@(alist-delete "isl" (package-native-inputs xgcc))))
|
||||
|
@ -269,7 +270,22 @@ (define-public gcc-arm-none-eabi-7-2018-q2-update
|
|||
(lambda _
|
||||
(substitute* "gcc/genmultilib"
|
||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||
#t))))
|
||||
#t))
|
||||
(add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((gcc (assoc-ref inputs "gcc")))
|
||||
;; Remove the default compiler from CPLUS_INCLUDE_PATH to
|
||||
;; prevent header conflict with the GCC from native-inputs.
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-join
|
||||
(delete (string-append gcc "/include/c++")
|
||||
(string-split (getenv "CPLUS_INCLUDE_PATH")
|
||||
#\:))
|
||||
":"))
|
||||
(format #t
|
||||
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
|
||||
(getenv "CPLUS_INCLUDE_PATH"))
|
||||
#t)))))
|
||||
((#:configure-flags flags)
|
||||
;; The configure flags are largely identical to the flags used by the
|
||||
;; "GCC ARM embedded" project.
|
||||
|
|
Loading…
Reference in a new issue