From 83b0a7f41bccb7b46f1d443e80a22c61a3ff92bc Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Sun, 5 May 2019 14:33:46 +0000 Subject: gnu: cross-base: Apply gcc 8 patch to gcc >= 8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- gnu/packages/cross-base.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/cross-base.scm') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index bb3d6d916a..25caacb723 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -205,9 +205,10 @@ (define* (cross-gcc target (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 -- cgit v1.2.3