[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: cross-base: Apply gcc 6 patch to gcc >= 6.
From: |
Danny Milosavljevic |
Subject: |
03/03: gnu: cross-base: Apply gcc 6 patch to gcc >= 6. |
Date: |
Sat, 20 Jan 2018 14:34:06 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit e32d302474ce7c24fae6906198032f4cdbab205c
Author: Danny Milosavljevic <address@hidden>
Date: Sat Jan 20 20:25:36 2018 +0100
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 abc3a28..82b10fe 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