diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-12-24 23:34:03 +0100 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-12-25 11:06:09 +0100 |
commit | 04c4ef351fa7d0702f09a5770e2d99544c45d205 (patch) | |
tree | f4e78834f1827dde81a48a4fa0623b7b29130f79 /gnu/packages/patches | |
parent | c215051dcf30b11c755aea4e2527b4d3d91c34bb (diff) | |
download | guix-04c4ef351fa7d0702f09a5770e2d99544c45d205.tar.gz |
gnu: Add gcc-arm-none-eabi-7-2018-q2-update.
* gnu/packages/embedded.scm (gcc-arm-none-eabi-7-2018-q2-update): New variable. * gnu/packages/patches/gcc-7-cross-environment-variables.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/gcc-7-cross-environment-variables.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/gnu/packages/patches/gcc-7-cross-environment-variables.patch b/gnu/packages/patches/gcc-7-cross-environment-variables.patch new file mode 100644 index 0000000000..99ae36f103 --- /dev/null +++ b/gnu/packages/patches/gcc-7-cross-environment-variables.patch @@ -0,0 +1,67 @@ +Search path environment variables for cross-compilers. See the discussion +at <http://gcc.gnu.org/ml/gcc/2013-02/msg00124.html>. + +Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed +at <http://bugs.gnu.org/22186>. + +diff --git a/gcc/gcc.c b/gcc/gcc.c +index eced0d5..08dec2b 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -4317,7 +4317,7 @@ process_command (unsigned int decoded_options_count, + } + + temp = env.get (LIBRARY_PATH_ENV); +- if (temp && *cross_compile == '0') ++ if (temp) + { + const char *startp, *endp; + char *nstore = (char *) alloca (strlen (temp) + 3); +diff --git a/gcc/incpath.c b/gcc/incpath.c +index 98fe5ec..96aff65 100644 +--- a/gcc/incpath.c ++++ b/gcc/incpath.c +@@ -461,8 +461,8 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + int stdinc, int cxx_stdinc, int verbose) + { + static const char *const lang_env_vars[] = +- { "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH", +- "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" }; ++ { "CROSS_C_INCLUDE_PATH", "CROSS_CPLUS_INCLUDE_PATH", ++ "CROSS_OBJC_INCLUDE_PATH", "CROSS_OBJCPLUS_INCLUDE_PATH" }; + cpp_options *cpp_opts = cpp_get_options (pfile); + size_t idx = (cpp_opts->objc ? 2: 0); + +@@ -473,7 +473,7 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, + + /* CPATH and language-dependent environment variables may add to the + include chain. */ +- add_env_var_paths ("CPATH", BRACKET); ++ add_env_var_paths ("CROSS_CPATH", BRACKET); + add_env_var_paths (lang_env_vars[idx], SYSTEM); + + target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc); +diff --git a/gcc/system.h b/gcc/system.h +index 0cbf60a..3242c68 100644 +--- a/gcc/system.h ++++ b/gcc/system.h +@@ -1169,4 +1169,6 @@ helper_const_non_const_cast (const char *p) + /* Get definitions of HOST_WIDE_INT. */ + #include "hwint.h" + ++#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" ++ + #endif /* ! GCC_SYSTEM_H */ +diff --git a/gcc/tlink.c b/gcc/tlink.c +index a2a7db0..2d96872 100644 +--- a/gcc/tlink.c ++++ b/gcc/tlink.c +@@ -456,7 +456,7 @@ recompile_files (void) + file *f; + + putenv (xstrdup ("COMPILER_PATH=")); +- putenv (xstrdup ("LIBRARY_PATH=")); ++ putenv (xstrdup (LIBRARY_PATH_ENV "=")); + + while ((f = file_pop ()) != NULL) + { |