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 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);
ages</a>/<a href='/guix/log/po/packages/ko.po?id=6943f22ee6956bc6c8e57e191dbdf6d9dcd5995e'>ko.po</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/po/packages/ko.po?id=6943f22ee6956bc6c8e57e191dbdf6d9dcd5995e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-04 16:52:02 +0200'>2022-09-04</span></td><td><a href='/guix/commit/po/packages/ko.po?id=77e3042aef6d8e519d016555464e466399318b4f'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-08-10 23:32:24 +0200'>2022-08-10</span></td><td><a href='/guix/commit/po/packages/ko.po?id=aacbe59fbceb8a93ecb68fed8581dfdd70dafc11'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-07-09 21:49:34 +0200'>2022-07-09</span></td><td><a href='/guix/commit/po/packages/ko.po?id=e0d47d8facafb6d6c04741bbf30eefbc68aaefb9'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-06-04 17:42:54 +0200'>2022-06-04</span></td><td><a href='/guix/commit/po/packages/ko.po?id=809c57c872a6dd48007d1abf6d7f3dd1482ec53a'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-05-01 18:07:34 +0200'>2022-05-01</span></td><td><a href='/guix/commit/po/packages/ko.po?id=6b4124cdcc203d47dc40158062afa1497d73d592'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-04-02 18:42:36 +0200'>2022-04-02</span></td><td><a href='/guix/commit/po/packages/ko.po?id=8a208df17fe81fbf34f5a86cc52bb0b8e33c7b96'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-03-01 22:17:18 +0100'>2022-03-01</span></td><td><a href='/guix/commit/po/packages/ko.po?id=8c92d85e06e65c5cdb5f6c75faf8aa33e5a68513'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-02-04 18:29:00 +0100'>2022-02-04</span></td><td><a href='/guix/commit/po/packages/ko.po?id=8391a99d089322a39cbacb1e6dc2979d8b2ef7c9'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-01-09 11:35:59 +0100'>2022-01-09</span></td><td><a href='/guix/commit/po/packages/ko.po?id=934b0cdfee2078bad42429427e12d6ee2ddb7fec'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-12-04 19:40:52 +0100'>2021-12-04</span></td><td><a href='/guix/commit/po/packages/ko.po?id=7fcb20a8fa242ab53b9bc97ef0b0367c6a399bd4'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-11-06 14:06:36 +0100'>2021-11-06</span></td><td><a href='/guix/commit/po/packages/ko.po?id=85430a9ea6f32aaae3e34741e292a01a2de62ee0'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-10-17 22:10:25 +0200'>2021-10-17</span></td><td><a href='/guix/commit/po/packages/ko.po?id=15c91189cb61c579f4289047c79530cefe75215f'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-09-02 04:06:52 +0200'>2021-09-02</span></td><td><a href='/guix/commit/po/packages/ko.po?id=1ff2092a39dc5c7c7cd9b4a0ba4b59f92e738efc'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-08-04 14:49:53 +0200'>2021-08-04</span></td><td><a href='/guix/commit/po/packages/ko.po?id=6c10c96fedf707d7be059aeb79bd5c8e2d2fa210'>nls: Update translations.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-05-10 22:34:43 -0400'>2021-05-10</span></td><td><a href='/guix/commit/po/packages/ko.po?id=21fcced608c93e1ac836cdd9ab8c5d200c667e75'>nls: Update translations.</a></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-18 13:18:22 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/packages/ko.po?id=0f355124af123f793bfd3011341d2d539c965884'>nls: Add Korean translation.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>