diff options
| author | Carl Dong <contact@carldong.me> | 2019-05-05 14:33:46 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-05-06 10:21:38 +0200 |
| commit | 83b0a7f41bccb7b46f1d443e80a22c61a3ff92bc (patch) | |
| tree | 7842f9243755049245c322deba17c9e3859bbf04 /gnu/packages/cross-base.scm | |
| parent | bdfc327639dd613f47fd21f7f809b2ea75b46d5f (diff) | |
| download | guix-83b0a7f41bccb7b46f1d443e80a22c61a3ff92bc.tar guix-83b0a7f41bccb7b46f1d443e80a22c61a3ff92bc.tar.gz | |
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>
Diffstat (limited to 'gnu/packages/cross-base.scm')
| -rw-r--r-- | gnu/packages/cross-base.scm | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ 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 |