Search path environment variables for cross-compilers. See the discussion at . Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed at . --- 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 42bc509..af3b9ad 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -1063,4 +1063,6 @@ helper_const_non_const_cast (const char *p) /* Get definitions of HOST_WIDE_INT and HOST_WIDEST_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 bc358b8..ad6242f 100644 --- a/gcc/tlink.c +++ b/gcc/tlink.c @@ -458,7 +458,7 @@ recompile_files (void) file *f; putenv (xstrdup ("COMPILER_PATH=")); - putenv (xstrdup ("LIBRARY_PATH=")); + putenv (xstrdup (LIBRARY_PATH_ENV "=")); while ((f = file_pop ()) != NULL) { diff --git a/gcc/gcc.c b/gcc/gcc.c index 0f042b0..c23fb0b 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -4264,7 +4264,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); ea2c68b479202fdca9'>packages/mes.scm
AgeCommit message (Expand)Author
2022-06-07gnu: nyacc: Update to 1.07.0....* gnu/packages/mes.scm (nyacc): Update to 1.07.0. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Felix Lechner
2022-05-06gnu: mescc-tools: Update supported-systems....* gnu/packages/mes.scm (mescc-tools)[supported-systems]: Add riscv32-linux, riscv64-linux, remove powerpc64le-linux. Jan (janneke) Nieuwenhuizen
2022-05-02gnu: mes: Update to 0.24....* gnu/packages/mes.scm (mes-next)[source]: Update to 0.24. [native-inputs]: Add m2-planet. Jan (janneke) Nieuwenhuizen
2022-05-02gnu: m2-planet: Update to 1.9.0....* gnu/packages/mes.scm (m2-planet): Update to 1.9.0. Jan (janneke) Nieuwenhuizen
2022-05-02gnu: mescc-tools: Update to 1.4.0....* gnu/packages/mes.scm (mescc-tools): Update to 1.4.0. Jan (janneke) Nieuwenhuizen
2022-03-09gnu: nyacc@1.00.2: Fix build....Fixes a regression introduced in f15ca337bec89f238b9b9ced08c2e02c35629a33, whereby adding a dependency on GUILE-BYTESTRUCTURES would cause a build failure of the FFI helper of nyacc@1.00.2. * gnu/packages/mes.scm (nyacc-1.00.2)[propagated-inputs]: New field. Ludovic Courtès
2022-01-26gnu: nyacc: Remove unnecessary phase....This partially reverts commit f15ca337bec89f238b9b9ced08c2e02c35629a33. What mattered was the addition of guile-bytestructures. * gnu/packages/mes.scm (nyacc)[arguments]: Remove phase 'install-system-module. Ricardo Wurmus
2022-01-26gnu: nyacc: Install all modules....* gnu/packages/mes.scm (nyacc)[arguments]: Add build phase 'install-system-module. [propagated-inputs]: Add guile-bytestructures. Ricardo Wurmus
2022-01-26gnu: nyacc: Fix bug 60474....* gnu/packages/mes.scm (nyacc)[arguments]: Add build phase 'fix-60474. Ricardo Wurmus
2022-01-26gnu: nyacc: Update to 1.06.5....* gnu/packages/mes.scm (nyacc): Update to 1.06.5. [source]: Simplify snippet. Ricardo Wurmus