Search path environment variables for cross-compilers. See the discussion at . Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed at . 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) { kages/syndication.scm?id=951610567f623512a88ac20b879e00d442f85abe'>syndication.scm
AgeCommit message (Expand)Author
2020-10-18gnu: newsboat-2.13: Build with json-c-0.13....* gnu/packages/syndication.scm (newsboat-2.13)[inputs]: Replace json-c with json-c@.013. Efraim Flashner
2020-10-13gnu: newsboat: Update to 2.21....* gnu/packages/syndication.scm (newsboat): Update to 2.21. [source]: Remove snippet. [inputs]: Replace json-c-0.13 with json-c. [arguments]: In cargo-inputs replace rust-gettext-rs-0.4 with 0.5, rust-rand-0.6 with 0.7. Remove rust-dirs-2.0, rust-libz-1, rust-percent-encoding-2, rust-smallvec-0.6. Add rust-lazy-static-1. Add new phase to patch the source slightly. Efraim Flashner
2020-10-12gnu: rust-percent-encoding-2.1: Remove minor version from variable name....* gnu/packages/crates-io.scm (rust-percent-encoding-2.1): Rename to rust-percent-encoding-2. Arun Isaac
2020-10-12gnu: rust-url-2.1: Remove minor version from variable name....* gnu/packages/crates-io.scm (rust-url-2.1): Rename to rust-url-2. Arun Isaac
2020-09-30gnu: newsboat: Fix inputs....This is a follow-up to 51b46fa28cd31cf1cc973ef6ccd05fbef3c4b39d. * gnu/packages/syndication.scm (newsboat)[arguments]: Replace rust-once-cell-1.2 with rust-once-cell-1. Efraim Flashner
2020-09-08gnu: liferea: Update to 1.12.9....* gnu/packages/syndication.scm (liferea): Update to 1.12.9. Fix indentation. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> Vinicius Monego
2020-08-31gnu: rust-libz-sys-1.0: Rename rust-libz-sys-1....* gnu/packages/crates-io.scm (rust-libz-sys-1.0): Rename rust-libz-sys-1. (rust-curl-sys-0.4, rust-flate2-1.0, rust-freetype-sys-0.9, rust-libgit2-sys-0.10, rust-libgit2-sys-0.7, rust-libssh2-sys-0.2) [arguments]: Adjust accordingly. * gnu/packages/syndication.scm (newsboat)[arguments]: Same. Efraim Flashner
2020-07-26gnu: newsboat: Update to 2.20.1....* gnu/packages/syndication.scm (newsboat): Update to 2.20.1. [source]: Add snippet to loosen version requirement on crate dependency. [build-system]: Switch to cargo-build-system. [native-inputs]: Remove asciidoc, add openssl, asciidoctor. [arguments]: Add gnu-build-system module. Add vendor-dir, cargo-inputs, cargo-development-inputs fields. Don't delete 'configure phase. Add custom 'dont-vendor-self-phase. Replace 'build, 'check, 'install phases with gnu counterparts. (newsboat-2.13): New variable. Efraim Flashner