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)
     {
gnu/packages?id=0e001b1f412d26937eb7cc616dab6b8a8b6beeee'>packages</a>/<a href='/guix/log/gnu/packages/java-compression.scm?id=0e001b1f412d26937eb7cc616dab6b8a8b6beeee'>java-compression.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/packages/java-compression.scm?id=0e001b1f412d26937eb7cc616dab6b8a8b6beeee&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-17 04:14:45 +0200'>2020-07-17</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=51087d51df20b89cf081aaa895efadbb73e6550b'>gnu: maven: Install from pom file.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-07-17 04:12:43 +0200'>2020-07-17</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=02ed96dccf4764dc707bcfcb523b24cf31ed2a79'>gnu: java-plexus-archiver: Update to 4.2.2.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-05-17 01:50:30 +0200'>2020-05-17</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=d308bc01e171f327084bfaa9fe79fb31fe662669'>gnu: java-xz: Remove duplicate definition.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-03-13 05:36:09 +0100'>2020-03-13</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=287e3d312440a103e8ca1e14b5b09a0ce0124e5e'>gnu: java-iq80-snappy: Don't use unstable tarball.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-03-13 05:36:09 +0100'>2020-03-13</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=e2528a3cc1819d3fe24880c5cfec74f075d5f820'>gnu: java-snappy@1.0: Don't use unstable tarball.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-03-12 04:57:40 +0100'>2020-03-12</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=0308944ab06a103791c853743c88280a2abc114f'>gnu: java-snappy: Don't use unstable tarball.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-03-12 04:57:39 +0100'>2020-03-12</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=ca0fe294d65aff8bd1b11d0c81e968870c0f1084'>gnu: java-snappy: Update to 1.1.7.3.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-01-15 17:45:33 +0100'>2019-01-15</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=4fec042b54d65a2f44cc3602f7d6f82292e3d1a9'>gnu: Move Python compression packages to new module.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-01-12 12:14:28 +0100'>2019-01-12</span></td><td><a href='/guix/commit/gnu/packages/java-compression.scm?id=24155bf40db2dfd25c167f41452ea0227a712654'>gnu: Move Java compression packages to new module.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>