aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2018-01-20 20:25:36 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2018-01-20 20:33:11 +0100
commite32d302474ce7c24fae6906198032f4cdbab205c (patch)
treec0310ea9776aef21869959c7be1e15c5ae26abc3 /gnu
parentf074f5e88ccdb8c5c959d1a60cc03b4c2fc3d823 (diff)
downloadguix-e32d302474ce7c24fae6906198032f4cdbab205c.tar
guix-e32d302474ce7c24fae6906198032f4cdbab205c.tar.gz
gnu: cross-base: Apply gcc 6 patch to gcc >= 6.
* gnu/packages/cross-base.scm (cross-gcc): Apply gcc 6 patch to gcc >= 6.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/cross-base.scm4
1 files changed, 3 insertions, 1 deletions
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