diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-20 19:56:30 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-09 21:53:41 +0100 |
| commit | 01e8263febb9634564b4b73af49b81a36567a11b (patch) | |
| tree | a677ded14474ed0ba2b84a800592ac0577b56b27 /gnu/packages/rust.scm | |
| parent | de92ab21c162e69bd15b7215ade61bc47603c8bc (diff) | |
| download | guix-01e8263febb9634564b4b73af49b81a36567a11b.tar.gz | |
gnu: Use GCC 7 as the default compiler.
* gnu/packages/cross-base.scm (%gcc-cross-include-paths): Remove CROSS_C_INCLUDE_PATH & co in favor of CROSS_CPATH. * gnu/build/cross-toolchain.scm (%gcc-cross-include-paths): Likewise. (cross-gcc-build-phases): Set CROSS_C_INCLUDE_PATH and CROSS_CPLUS_INCLUDE_PATH when building the cross GCC. * gnu/packages/commencement.scm (libstdc++): Add "--disable-libstdcxx-dual-abi" to #:configure-flags. (gcc-boot0)[arguments]: Add "--disable-libmpx" to #:configure-flags. (gcc-final): Add phase to set C_INCLUDE_PATH and CPLUS_INCLUDE_PATH before building GCC. (gcc-toolchain-5): Use MAKE-GCC-TOOLCHAIN. (gcc-toolchain-7): Change to GCC-TOOLCHAIN. * gnu/packages/gcc.scm (gcc): Change from GCC-5 to GCC-7. (gfortran): Change to GFORTRAN-7. (gcc-objc): Change to GCC-OBJC-7. (gcc-objc++): Change to GCC-OBJC++-7. * gnu/packages/rust.scm (rust-1.19.0)[native-search-paths]: Change from C_INCLUDE_PATH & co to CPATH.
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 501736d898..6e3ea79845 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -406,10 +406,7 @@ test = { path = \"../libtest\" } ;; modules (see <https://bugs.gnu.org/31392>). (native-search-paths (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") + (variable "CPATH") (files '("include"))) (search-path-specification (variable "LIBRARY_PATH") |