gnu: cross-base: Apply gcc 8 patch to gcc >= 8.

* gnu/packages/cross-base.scm (cross-gcc): Apply gcc 8 patch to gcc >= 8.
* gnu/packages/patches/gcc-8-cross-environment-variables.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add the patch.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Carl Dong 2019-05-05 14:33:46 +00:00 committed by Ludovic Courtès
parent bdfc327639
commit 83b0a7f41b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 72 additions and 3 deletions

View file

@ -205,9 +205,10 @@ target that libc."
(patches
(append
(origin-patches (package-source xgcc))
(cons (if (version>=? (package-version xgcc) "6.0")
(search-patch "gcc-6-cross-environment-variables.patch")
(search-patch "gcc-cross-environment-variables.patch"))
(cons (cond
((version>=? (package-version xgcc) "8.0") (search-patch "gcc-8-cross-environment-variables.patch"))
((version>=? (package-version xgcc) "6.0") (search-patch "gcc-6-cross-environment-variables.patch"))
(else (search-patch "gcc-cross-environment-variables.patch")))
(cross-gcc-patches target))))
(modules '((guix build utils)))
(snippet