From e32d302474ce7c24fae6906198032f4cdbab205c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 20 Jan 2018 20:25:36 +0100 Subject: gnu: cross-base: Apply gcc 6 patch to gcc >= 6. * gnu/packages/cross-base.scm (cross-gcc): Apply gcc 6 patch to gcc >= 6. --- gnu/packages/cross-base.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index abc3a2821c..82b10fe843 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -202,7 +202,9 @@ target that libc." (patches (append (origin-patches (package-source xgcc)) - (cons (search-patch "gcc-cross-environment-variables.patch") + (cons (if (version>=? (package-version xgcc) "6.0") + (search-patch "gcc-6-cross-environment-variables.patch") + (search-patch "gcc-cross-environment-variables.patch")) (cross-gcc-patches target)))) (modules '((guix build utils))) (snippet -- cgit v1.2.3