diff options
author | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-03-14 11:39:52 +0100 |
---|---|---|
committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-03-24 13:55:10 +0100 |
commit | 53de3e74fac862bc07de160e8e226372de213dd1 (patch) | |
tree | 886b2053117b1d66524d07b2099c7924e5dad6d6 /gnu/local.mk | |
parent | 2e9c43aa9adac2bd6bcf92373d1cf9f322afa5a3 (diff) | |
download | guix-patches-53de3e74fac862bc07de160e8e226372de213dd1.tar guix-patches-53de3e74fac862bc07de160e8e226372de213dd1.tar.gz |
gnu: cross-gcc: Add a "lib" output.
Add a "lib" output to cross-gcc. This requires an upstream GCC patch adding
support for --with-toolexeclibdir configure option. This option allows to
install cross-built GCC libraries in a specific location.
This also fixes the computation of TOOLDIR_BASE_PREFIX, that fails when
/gnu/store/... directories are involved.
* gnu/packages/patches/gcc-7-cross-toolexeclibdir.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/cross-base.scm (cross-gcc)[source]: Apply it,
[outputs]: add a "lib" output,
(cross-gcc-snippet): fix TOOLDIR_BASE_PREFIX.
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9db4019d2b..38dec7f081 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -14,7 +14,7 @@ # Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> -# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> +# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com> # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> # Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> @@ -918,6 +918,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-6-source-date-epoch-2.patch \ %D%/packages/patches/gcc-7-cross-mingw.patch \ %D%/packages/patches/gcc-7-cross-environment-variables.patch \ + %D%/packages/patches/gcc-7-cross-toolexeclibdir.patch \ %D%/packages/patches/gcc-8-cross-environment-variables.patch \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ |