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)
     {
f='/guix/log/gnu/services/games.scm?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>games.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/games.scm?id=8eefb81b773a400f49d79410656f72ff2bbc1602&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-14 07:53:21 -0500'>2023-01-14</span></td><td><a href='/guix/commit/gnu/services/games.scm?id=202ac747e697a2373f0201be490e668695283eb4'>gnu: services: Add joycond-service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/games.scm (joycond-configuration): New configuration type.
(joycond-shepherd-service): New procedure.
(joycond-service-type): New variable.
* doc/guix.texi (Game Services): Document it.
</span></span></td><td>David Thompson</td></tr>
<tr><td><span title='2022-05-01 21:30:36 +0200'>2022-05-01</span></td><td><a href='/guix/commit/gnu/services/games.scm?id=53dbc6fd9a2f476f38e17496457a6b3b06e71687'>services: wesnothd: Use 'least-authority-wrapper'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/games.scm (wesnothd-shepherd-service): Use
'least-authority-wrapper' instead of
'make-forkexec-constructor/container'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-05-01 21:30:36 +0200'>2022-05-01</span></td><td><a href='/guix/commit/gnu/services/games.scm?id=19df5f2423c34e798d1629bb11f2e5e5f29e951e'>services: wesnothd: Grant write access to /var/run/wesnothd.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/games.scm (wesnothd-shepherd-service): Augment 'modules'
field.  Pass #:mappings argument to 'make-forkexec-constructor/container'.
(wesnothd-activation): New variable.
(wesnothd-service-type): Extend ACTIVATION-SERVICE-TYPE.
</span></span></td><td>Ludovic Courtès</td></tr>