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 a716f708259..dc7862f413a 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -4342,7 +4342,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 b11c6a57939..a66a94a04e5 100644
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -472,8 +472,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);

@@ -484,7 +484,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", INC_BRACKET);
+  add_env_var_paths ("CROSS_CPATH", INC_BRACKET);
   add_env_var_paths (lang_env_vars[idx], INC_SYSTEM);

   target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc);
diff --git a/gcc/system.h b/gcc/system.h
index 4abc321c71d..d6186476024 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -1209,4 +1209,6 @@ helper_const_non_const_cast (const char *p)
 void qsort_chk (void *, size_t, size_t, int (*)(const void *, const void *));
 #endif

+#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH"
+
 #endif /* ! GCC_SYSTEM_H */
diff --git a/gcc/tlink.c b/gcc/tlink.c
index ec20bd2fa0f..cd17bdce004 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)
     {
eft'>Author</th></tr>
<tr><td><span title='2024-08-05 00:44:43 +0300'>2024-08-05</span></td><td><a href='/guix/commit/.mailmap?id=3c309a7b7020a9645bfe775d9f53f43f05d076bf'>Change email of Evgeny Pisemsky.</a><span class='msg-avail'>...</span></td><td>Evgeny Pisemsky</td></tr>
<tr><td><span title='2024-01-07 19:07:18 +0100'>2024-01-07</span></td><td><a href='/guix/commit/.mailmap?id=7b58443bc5506a56ea78aaf44006ce6209ee6cc8'>Update mailmap.</a><span class='msg-avail'>...</span></td><td>Tomas Volf</td></tr>
<tr><td><span title='2023-08-16 22:22:06 +0200'>2023-08-16</span></td><td><a href='/guix/commit/.mailmap?id=fce924708c31c09a1b438ae7e8b83d39c492be9a'>Update email addresses for Juliana Sims.</a><span class='msg-avail'>...</span></td><td>Juliana Sims</td></tr>
<tr><td><span title='2022-01-11 14:48:00 -0500'>2022-01-11</span></td><td><a href='/guix/commit/.mailmap?id=7f779286df7e8636d901f4734501902cc934a72f'>Update mailmap.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2021-11-06 16:03:43 +0100'>2021-11-06</span></td><td><a href='/guix/commit/.mailmap?id=567c4f4495fd1681bc6bd1ca3e9d1a87e120ac61'>Update mailmap and copyright assignments for Liliana Marie Prikler.</a><span class='msg-avail'>...</span></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2021-09-06 12:15:57 +0200'>2021-09-06</span></td><td><a href='/guix/commit/.mailmap?id=7158f8e4e9f81dbe004789018dcf06a5fe87d602'>Update mailmap.</a><span class='msg-avail'>...</span></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2021-09-04 12:25:17 +0200'>2021-09-04</span></td><td><a href='/guix/commit/.mailmap?id=1fd0bf60ea261fac426052386029ead0ac68cad1'>Update mailmap.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2021-07-27 12:34:56 -0400'>2021-07-27</span></td><td><a href='/guix/commit/.mailmap?id=c0e6e8d25e3750a35bebc80469ee86e7826bd769'>Update mailmap.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2021-07-08 09:48:22 +0200'>2021-07-08</span></td><td><a href='/guix/commit/.mailmap?id=0a04c25482c4d848a6a29711fccf5682319e26aa'>mailmap: Update entries for Matthew James Kraai.</a><span class='msg-avail'>...</span></td><td>Matthew James Kraai</td></tr>
<tr><td><span title='2021-06-23 22:29:23 -0500'>2021-06-23</span></td><td><a href='/guix/commit/.mailmap?id=6d388103a4ed8f14f1ac6ac7a2ff22c5fa6b8cd4'>gnu: Add Sollya.</a><span class='msg-avail'>...</span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2021-04-21 18:02:27 -0400'>2021-04-21</span></td><td><a href='/guix/commit/.mailmap?id=449844474da86b5f10a4c5e4f1744e1e3a716d6e'>Update email address for Kei.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>