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>.

--- 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);
>services.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.scm?id=fb2347f6d161db0c0ec5fd8fd952ab8cdb7c2738&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-08-19 16:36:04 +0200'>2024-08-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=2cccf2f11c925c8bb04a6a28f363a3852f66d913'>services: Truly mark ‘setuid-program-service-type’ as deprecated.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-08-19 16:34:07 +0200'>2024-08-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=52ac2db924891ed66eb7fb7e6a4bd4af20333a83'>services: privileged-program: No libcap when cross-compiling to the Hurd.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=71f0676a295841e2cc662eec0d3e9b7e69726035'>privilege: Add POSIX capabilities(7) support.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=4e58dfee6c7456d1e662f66041b8a157efe8710a'>system: Add privileged-programs to &lt;operating-system&gt;.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=d73ca7ecb6e2dac91c13b8924ee6bed42c272980'>services: Rename setuid-program-service-type.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=f3b84be52dd8397abceb46219a15d5d78c982115'>build: Rename activate-setuid-programs.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-08-11 02:00:00 +0200'>2024-08-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=d6c9754c568588929c3350da8f7b17ae92d2b801'>services: setuid-program: Populate /run/privileged/bin.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2024-03-22 11:40:33 +0100'>2024-03-22</span></td><td><a href='/guix/commit/gnu/services.scm?id=29de2edfbbed21ac016f73a45d399795fc2e4dfb'>system, home: Validate ‘services’ field value.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-02-19 18:41:47 +0100'>2024-02-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=e73db355b127b9ca2b5339f645f2d3eb6929531f'>services: activation: Ensure /var/run existence.</a><span class='msg-avail'>...</span></td><td>Nicolas Graves</td></tr>
<tr><td><span title='2023-12-02 12:25:45 +0100'>2023-12-02</span></td><td><a href='/guix/commit/gnu/services.scm?id=b0715d7cd2a74bc231751f8afc9dffb2047501ac'>gnu: Use ‘libc-utf8-locales-for-target’.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-08-31 23:31:50 -0400'>2023-08-31</span></td><td><a href='/guix/commit/gnu/services.scm?id=f66fa5f917e76935187935b09ae7ac037b8b35f8'>gnu: services: Revert to deleting and updating all matching services</a><span class='msg-avail'>...</span></td><td>Brian Cully</td></tr>
<tr><td><span title='2023-08-20 22:48:47 +0200'>2023-08-20</span></td><td><a href='/guix/commit/gnu/services.scm?id=dff7d2468ffe9d01b25662544af380e1794ac55a'>services: Define 'for-home'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>