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 adbf0c4..70448c6 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -3853,7 +3853,7 @@ process_command (unsigned int decoded_options_count, } temp = getenv (LIBRARY_PATH_ENV); - if (temp && *cross_compile == '0') + if (temp) { const char *startp, *endp; char *nstore = (char *) alloca (strlen (temp) + 3); g/gnu/packages?id=1c088531cf0be8fe6706c4624a920fca2ab2fee0'>packages/calendar.scm
AgeCommit message (Expand)Author
2024-08-31gnu: date: Fix build with newer tzdata....* gnu/packages/patches/date-ignore-zonenow.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/calendar.scm (date): Use it. Change-Id: I29bdfb49237650706abd870f2b9875739d12c6d5 Josselin Poiret
2024-08-31gnu: remind: Add 'bash' input for 'wrap-program'....It is required for cross-compilation. * gnu/packages/calendar.scm (remind)[inputs]: Add 'bash-minimal'. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I17b53c1bdb59eedffed8c9079bd7d065988bfac0 Maxime Devos
2024-03-30Merge branch 'gnome-team'Liliana Marie Prikler
2024-03-21gnu: khal: Update to 0.11.3....* gnu/packages/calendar.scm (khal): Update to 0.11.3. Change-Id: I848166bfe9469ee37b8acd126fdc3a307914a63b Efraim Flashner
2024-02-03Merge branch 'master' into gnome-teamLiliana Marie Prikler
2024-01-30gnu: libhdate: Fix pkg-config file....* gnu/packages/calendar.scm (libhdate)[source]: Add snippet to adjust the pkg-config file to have the correct prefix. Change-Id: I5273f732a4e4e512057aa8bc1ecd40a81ec7828e Efraim Flashner
2023-11-17gnu: libical: Update to 3.0.17....* gnu/packages/calendar.scm (libical): Update to 3.0.17. Change-Id: Ifa230c4e514d7bc4ea01907928678e8bfb490783 Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com> Vivien Kraus