commit: fec800d970afa89845479d5d6ad58140eaae5035 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Aug 5 07:57:11 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 23 13:51:19 2024 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=fec800d9
15.0.0: add 09_all_esysroot.patch Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> 15.0.0/gentoo/09_all_esysroot.patch | 67 +++++++++++++++++++++++++++++++++++++ 15.0.0/gentoo/README.history | 1 + 2 files changed, 68 insertions(+) diff --git a/15.0.0/gentoo/09_all_esysroot.patch b/15.0.0/gentoo/09_all_esysroot.patch new file mode 100644 index 0000000..80e0561 --- /dev/null +++ b/15.0.0/gentoo/09_all_esysroot.patch @@ -0,0 +1,67 @@ +From 71e048084d32811f6e17e73b6ebadfe550ef1193 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <[email protected]> +Date: Sun, 4 Aug 2024 17:02:06 +0100 +Subject: [PATCH] Allow setting target sysroot with ESYSROOT env var for + cross-compilers + +The variable is ignored for native compilers. The --sysroot command line +option takes precedence. + +Signed-off-by: James Le Cuirot <[email protected]> +--- + gcc/doc/invoke.texi | 10 ++++++++++ + gcc/gcc.cc | 10 ++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 0fe99ca8e..434cf30e2 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -19230,6 +19230,10 @@ for this option. If your linker does not support this option, the + header file aspect of @option{--sysroot} still works, but the + library aspect does not. + ++On Gentoo Linux, this option can also be set for cross-compilers using the ++@env{ESYSROOT} environmnent variable. The variable is ignored for native ++compilers. The command line option takes precedence. ++ + @opindex no-sysroot-suffix + @item --no-sysroot-suffix + For some targets, a suffix is added to the root directory specified +@@ -37657,6 +37661,12 @@ using GCC also uses these directories when searching for ordinary + libraries for the @option{-l} option (but directories specified with + @option{-L} come first). + ++@vindex ESYSROOT ++@item ESYSROOT ++On Gentoo Linux, this variable sets the logical root directory for headers and ++libraries for cross-compilers. It is ignored for native compilers. The ++@option{--sysroot} option takes precedence. ++ + @vindex LANG + @cindex locale definition + @item LANG +diff --git a/gcc/gcc.cc b/gcc/gcc.cc +index abdb40bfe..956363ddb 100644 +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -5516,6 +5516,16 @@ process_command (unsigned int decoded_options_count, + "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1); + free (tooldir_prefix); + ++ if (*cross_compile == '1' && !target_system_root_changed) ++ { ++ const char *esysroot = env.get("ESYSROOT"); ++ if (esysroot && esysroot[0] != '\0' && strcmp(esysroot, "/") != 0 && (!target_system_root || strcmp(esysroot, target_system_root) != 0)) ++ { ++ target_system_root = esysroot; ++ target_system_root_changed = 1; ++ } ++ } ++ + #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS) + /* If the normal TARGET_SYSTEM_ROOT is inside of $exec_prefix, + then consider it to relocate with the rest of the GCC installation +-- +2.45.2 + diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history index 82e55aa..76096c4 100644 --- a/15.0.0/gentoo/README.history +++ b/15.0.0/gentoo/README.history @@ -2,6 +2,7 @@ - 32_all_phi-opt-Fix-for-non-const-functions-for-factor_out_c.patch - 33_all_phiopt-Reject-non-gimple-val-inside-factor_out_condi.patch + + 09_all_esysroot.patch 10 19 August 2024
