push sheeet

pkgs/development/compilers/gcc/ng/15/gcc/fix-collect2-paths.diff

@@ -0,0 +1,315 @@
+diff --git a/gcc/collect2.cc b/gcc/collect2.cc
+index 268ac378b9c..8a5c606075a 100644
+--- a/gcc/collect2.cc
++++ b/gcc/collect2.cc
+@@ -327,7 +327,7 @@ static void write_aix_file (FILE *, struct id *);
+ static char *resolve_lib_name (const char *);
+ #endif
+ static char *extract_string (const char **);
+-static void post_ld_pass (bool);
++static void post_ld_pass (bool, bool);
+ static void process_args (int *argcp, char **argv);
+ 
+ /* Enumerations describing which pass this is for scanning the
+@@ -513,12 +513,10 @@ is_ctor_dtor (const char *s)
+ 
+ static struct path_prefix cpath, path;
+ 
+-#ifdef CROSS_DIRECTORY_STRUCTURE
+ /* This is the name of the target machine.  We use it to form the name
+    of the files to execute.  */
+ 
+ static const char *const target_machine = TARGET_MACHINE;
+-#endif
+ 
+ /* Search for NAME using prefix list PPREFIX.  We only look for executable
+    files.
+@@ -577,7 +575,7 @@ add_lto_object (struct lto_object_list *list, const char *name)
+ 
+ static void
+ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst,
+-			  const char **object, bool force)
++			  const char **object, bool force, bool is_cross_compiler)
+ {
+   const char **object_file = CONST_CAST2 (const char **, char **, object_lst);
+ 
+@@ -722,7 +720,7 @@ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst,
+ 		    "ld_args");
+       /* We assume that temp files were created, and therefore we need to take
+          that into account (maybe run dsymutil).  */
+-      post_ld_pass (/*temp_file*/true);
++      post_ld_pass (/*temp_file*/true, is_cross_compiler);
+       free (lto_ld_argv);
+ 
+       maybe_unlink_list (lto_o_files);
+@@ -734,10 +732,10 @@ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst,
+       fork_execute ("ld", lto_ld_argv, HAVE_GNU_LD && at_file_supplied,
+ 		    "ld_args");
+       /* No LTO objects were found, so no new temp file.  */
+-      post_ld_pass (/*temp_file*/false);
++      post_ld_pass (/*temp_file*/false, is_cross_compiler);
+     }
+   else
+-    post_ld_pass (false); /* No LTO objects were found, no temp file.  */
++    post_ld_pass (false, is_cross_compiler); /* No LTO objects were found, no temp file.  */
+ }
+ /* Entry point for linker invoation.  Called from main in collect2.cc.
+    LD_ARGV is an array of arguments for the linker.  */
+@@ -799,33 +797,14 @@ main (int argc, char **argv)
+   static const char *const gstrip_suffix = "gstrip";
+ 
+   const char *full_ld_suffixes[USE_LD_MAX];
+-#ifdef CROSS_DIRECTORY_STRUCTURE
+-  /* If we look for a program in the compiler directories, we just use
+-     the short name, since these directories are already system-specific.
+-     But it we look for a program in the system directories, we need to
+-     qualify the program name with the target machine.  */
+-
+-  const char *const full_nm_suffix =
+-    concat (target_machine, "-", nm_suffix, NULL);
+-  const char *const full_gnm_suffix =
+-    concat (target_machine, "-", gnm_suffix, NULL);
+-#ifdef LDD_SUFFIX
+-  const char *const full_ldd_suffix =
+-    concat (target_machine, "-", ldd_suffix, NULL);
+-#endif
+-  const char *const full_strip_suffix =
+-    concat (target_machine, "-", strip_suffix, NULL);
+-  const char *const full_gstrip_suffix =
+-    concat (target_machine, "-", gstrip_suffix, NULL);
+-#else
++  const char *full_nm_suffix;
++  const char *full_gnm_suffix;
++  const char *full_strip_suffix;
++  const char *full_gstrip_suffix;
++
+ #ifdef LDD_SUFFIX
+-  const char *const full_ldd_suffix	= ldd_suffix;
++  const char *full_ldd_suffix;
+ #endif
+-  const char *const full_nm_suffix	= nm_suffix;
+-  const char *const full_gnm_suffix	= gnm_suffix;
+-  const char *const full_strip_suffix	= strip_suffix;
+-  const char *const full_gstrip_suffix	= gstrip_suffix;
+-#endif /* CROSS_DIRECTORY_STRUCTURE */
+ 
+   const char *arg;
+   FILE *outf;
+@@ -840,6 +819,7 @@ main (int argc, char **argv)
+   const char **ld1;
+   bool use_plugin = false;
+   bool use_collect_ld = false;
++  bool is_cross_compiler = false;
+ 
+   /* The kinds of symbols we will have to consider when scanning the
+      outcome of a first pass link.  This is ALL to start with, then might
+@@ -864,17 +844,6 @@ main (int argc, char **argv)
+ #endif
+   int i;
+ 
+-  for (i = 0; i < USE_LD_MAX; i++)
+-#ifdef CROSS_DIRECTORY_STRUCTURE
+-    /* lld and mold are platform-agnostic and not prefixed with target
+-       triple.  */
+-    if (!(i == USE_LLD_LD || i == USE_MOLD_LD))
+-      full_ld_suffixes[i] = concat (target_machine, "-", ld_suffixes[i],
+-				    NULL);
+-    else
+-#endif
+-      full_ld_suffixes[i] = ld_suffixes[i];
+-
+   p = argv[0] + strlen (argv[0]);
+   while (p != argv[0] && !IS_DIR_SEPARATOR (p[-1]))
+     --p;
+@@ -1050,6 +1019,65 @@ main (int argc, char **argv)
+   prefix_from_env ("COMPILER_PATH", &cpath);
+   prefix_from_env ("PATH", &path);
+ 
++  /* Determine the full path name of the C compiler to use.  */
++  c_file_name = getenv ("COLLECT_GCC");
++  if (c_file_name == 0)
++    {
++      c_file_name = concat (target_machine, "-gcc", NULL);
++      p = find_a_file (&cpath, c_file_name, X_OK);
++      if (p == 0)
++        p = find_a_file (&path, c_file_name, X_OK);
++
++      if (p == 0) {
++        c_file_name = "gcc";
++        p = find_a_file (&cpath, c_file_name, X_OK);
++        if (p == 0)
++          p = find_a_file (&path, c_file_name, X_OK);
++      }
++    }
++  else
++    {
++      p = find_a_file (&cpath, c_file_name, X_OK);
++
++      /* Here it should be safe to use the system search path since we should have
++        already qualified the name of the compiler when it is needed.  */
++      if (p == 0)
++        p = find_a_file (&path, c_file_name, X_OK);
++    }
++
++  if (p)
++    c_file_name = p;
++
++  if (c_file_name) {
++    is_cross_compiler = strncmp(basename(c_file_name), target_machine, strlen(target_machine)) == 0;
++  }
++
++  for (i = 0; i < USE_LD_MAX; i++)
++    /* lld and mold are platform-agnostic and not prefixed with target
++       triple.  */
++    if (!(i == USE_LLD_LD || i == USE_MOLD_LD) && is_cross_compiler)
++      full_ld_suffixes[i] = concat (target_machine, "-", ld_suffixes[i],
++				    NULL);
++    else
++      full_ld_suffixes[i] = ld_suffixes[i];
++
++  full_nm_suffix =
++    is_cross_compiler ? concat (target_machine, "-", nm_suffix, NULL) : nm_suffix;
++
++  full_gnm_suffix =
++    is_cross_compiler ? concat (target_machine, "-", gnm_suffix, NULL) : gnm_suffix;
++
++  full_strip_suffix =
++    is_cross_compiler ? concat (target_machine, "-", strip_suffix, NULL) : strip_suffix;
++
++  full_gstrip_suffix =
++    is_cross_compiler ? concat (target_machine, "-", gstrip_suffix, NULL) : gstrip_suffix;
++
++#ifdef LDD_SUFFIX
++  full_ldd_suffix =
++    is_cross_compiler ? concat (target_machine, "-", ldd_suffix, NULL) : ldd_suffix;
++#endif
++
+   /* Try to discover a valid linker/nm/strip to use.  */
+ 
+   /* Maybe we know the right file to use (if not cross).  */
+@@ -1139,27 +1167,6 @@ main (int argc, char **argv)
+   if (strip_file_name == 0)
+     strip_file_name = find_a_file (&path, full_strip_suffix, X_OK);
+ 
+-  /* Determine the full path name of the C compiler to use.  */
+-  c_file_name = getenv ("COLLECT_GCC");
+-  if (c_file_name == 0)
+-    {
+-#ifdef CROSS_DIRECTORY_STRUCTURE
+-      c_file_name = concat (target_machine, "-gcc", NULL);
+-#else
+-      c_file_name = "gcc";
+-#endif
+-    }
+-
+-  p = find_a_file (&cpath, c_file_name, X_OK);
+-
+-  /* Here it should be safe to use the system search path since we should have
+-     already qualified the name of the compiler when it is needed.  */
+-  if (p == 0)
+-    p = find_a_file (&path, c_file_name, X_OK);
+-
+-  if (p)
+-    c_file_name = p;
+-
+   *ld1++ = *ld2++ = ld_file_name;
+ 
+   /* Make temp file names.  */
+@@ -1595,6 +1602,8 @@ main (int argc, char **argv)
+ 	       (c_file ? c_file : "not found"));
+       fprintf (stderr, "o_file              = %s\n",
+ 	       (o_file ? o_file : "not found"));
++      fprintf (stderr, "is_cross_compiler   = %s\n",
++          (is_cross_compiler ? "yes" : "no"));
+ 
+       ptr = getenv ("COLLECT_GCC_OPTIONS");
+       if (ptr)
+@@ -1644,9 +1653,9 @@ main (int argc, char **argv)
+ 	  maybe_unlink (export_file);
+ #endif
+ 	if (lto_mode != LTO_MODE_NONE)
+-	  maybe_run_lto_and_relink (ld1_argv, object_lst, object, false);
++	  maybe_run_lto_and_relink (ld1_argv, object_lst, object, false, is_cross_compiler);
+ 	else
+-	  post_ld_pass (/*temp_file*/false);
++	  post_ld_pass (/*temp_file*/false, is_cross_compiler);
+ 
+ 	return 0;
+       }
+@@ -1698,7 +1707,7 @@ main (int argc, char **argv)
+ 	do_link (ld1_argv, "ld1_args");
+ 
+       if (lto_mode)
+-        maybe_run_lto_and_relink (ld1_argv, object_lst, object, false);
++        maybe_run_lto_and_relink (ld1_argv, object_lst, object, false, is_cross_compiler);
+ 
+       /* Strip now if it was requested on the command line.  */
+       if (strip_flag)
+@@ -1716,7 +1725,7 @@ main (int argc, char **argv)
+ #ifdef COLLECT_EXPORT_LIST
+       maybe_unlink (export_file);
+ #endif
+-      post_ld_pass (/*temp_file*/false);
++      post_ld_pass (/*temp_file*/false, is_cross_compiler);
+       return 0;
+     }
+ 
+@@ -1799,15 +1808,15 @@ main (int argc, char **argv)
+   do_link (ld2_argv, "ld2_args");
+ 
+   if (lto_mode)
+-    maybe_run_lto_and_relink (ld2_argv, object_lst, object, false);
++    maybe_run_lto_and_relink (ld2_argv, object_lst, object, false, is_cross_compiler);
+ #else
+   /* Otherwise, simply call ld because link is already done.  */
+   if (lto_mode)
+-    maybe_run_lto_and_relink (ld2_argv, object_lst, object, true);
++    maybe_run_lto_and_relink (ld2_argv, object_lst, object, true, is_cross_compiler);
+   else
+     {
+       fork_execute ("ld", ld2_argv, HAVE_GNU_LD && at_file_supplied, "ld_args");
+-      post_ld_pass (/*temp_file*/false);
++      post_ld_pass (/*temp_file*/false, is_cross_compiler);
+     }
+ 
+   /* Let scan_prog_file do any final mods (OSF/rose needs this for
+@@ -3020,7 +3029,7 @@ process_args (int *argcp, char **argv) {
+ }
+ 
+ static void
+-do_dsymutil (const char *output_file) {
++do_dsymutil (const char *output_file, bool is_cross_compiler) {
+   const char *dsymutil = 0;
+   struct pex_obj *pex;
+   char **real_argv = XCNEWVEC (char *, verbose ? 4 : 3);
+@@ -3032,11 +3041,7 @@ do_dsymutil (const char *output_file) {
+    here is consistent with the way other installations work (and one can
+    always symlink a multitarget dsymutil with a target-specific name).  */
+   const char *dsname = "dsymutil";
+-#ifdef CROSS_DIRECTORY_STRUCTURE
+-  const char *qname = concat (target_machine, "-", dsname, NULL);
+-#else
+-  const char *qname = dsname;
+-#endif
++  const char *qname = is_cross_compiler ? concat (target_machine, "-", dsname, NULL) : dsname;
+ #ifdef DEFAULT_DSYMUTIL
+   /* Configured default takes priority.  */
+   if (dsymutil == 0 && access (DEFAULT_DSYMUTIL, X_OK) == 0)
+@@ -3071,14 +3076,14 @@ do_dsymutil (const char *output_file) {
+ }
+ 
+ static void
+-post_ld_pass (bool temp_file) {
++post_ld_pass (bool temp_file, bool is_cross_compiler) {
+   if (!(temp_file && flag_idsym) && !flag_dsym)
+     return;
+ 
+-  do_dsymutil (output_file);
++  do_dsymutil (output_file, is_cross_compiler);
+ }
+ #else
+ static void
+ process_args (int *argcp ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { }
+-static void post_ld_pass (bool temp_file ATTRIBUTE_UNUSED) { }
++static void post_ld_pass (bool temp_file ATTRIBUTE_UNUSED, bool is_cross_compiler ATTRIBUTE_UNUSED) { }
+ #endif

pkgs/development/compilers/gcc/ng/15/libgcc/force-regular-dirs.patch

@@ -0,0 +1,49 @@
+From bb3277895d3bd77bcacb7c489ebb1390478bbc12 Mon Sep 17 00:00:00 2001
+From: John Ericson <John.Ericson@Obsidian.Systems>
+Date: Thu, 17 Jul 2025 11:00:07 -0400
+Subject: [PATCH 2/2] Force regular dirs
+
+Override directories in libgcc so they are normal $out/lib and
+$dev/include. This is not suitable for upstreaming, but is done on top
+of a different patch which is, and which makes this smaller.
+
+---
+ libgcc/Makefile.in  | 6 +++---
+ libgcc/configure.ac | 3 ---
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
+index 4661c36703d..986cd035148 100644
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -202,10 +202,10 @@ STRIP = @STRIP@
+ STRIP_FOR_TARGET = $(STRIP)
+ 
+ # Used to install the shared libgcc.
+-slibdir = @slibdir@
++slibdir = $(libdir)
+ # Maybe used for DLLs on Windows targets.
+-toolexecdir = @toolexecdir@
+-toolexeclibdir = @toolexeclibdir@
++toolexecdir = $(bindir)
++toolexeclibdir = $(libdir)
+ 
+ export AR_FOR_TARGET
+ export AR_CREATE_FOR_TARGET
+diff --git a/libgcc/configure.ac b/libgcc/configure.ac
+index 5fdac5d95f2..89044cb65c9 100644
+--- a/libgcc/configure.ac
++++ b/libgcc/configure.ac
+@@ -479,9 +479,6 @@ if test x"$enable_as_accelerator_for" != x; then
+   accel_dir_suffix=/accel/${target_noncanonical}
+   real_host_noncanonical=${enable_as_accelerator_for}
+ fi
+-# Directory in which the compiler finds libraries etc.
+-libdir=${orig_libdir}/gcc/${real_host_noncanonical}/'$(version)'${accel_dir_suffix}
+-includedir=${libdir}/include
+ 
+ if test x"$enable_offload_targets" != x; then
+   extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o"
+-- 
+2.47.2
+

pkgs/development/compilers/gcc/ng/15/libgfortran/force-regular-dirs.patch

@@ -0,0 +1,53 @@
+From 7a0c8ca8872a73c6886940448ba9b3203b13268d Mon Sep 17 00:00:00 2001
+From: John Ericson <git@JohnEricson.me>
+Date: Mon, 21 Jul 2025 11:42:13 -0400
+Subject: [PATCH] libgfortran: Force regular include/lib dir
+
+---
+ libgfortran/Makefile.am | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
+index 21b35c76a06..3d38cde5b42 100644
+--- a/libgfortran/Makefile.am
++++ b/libgfortran/Makefile.am
+@@ -42,14 +42,13 @@ extra_darwin_ldflags_libgfortran += -Wc,-nodefaultrpaths
+ extra_darwin_ldflags_libgfortran += -Wl,-rpath,@loader_path
+ endif
+ 
+-gfor_c_HEADERS = ISO_Fortran_binding.h
+-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
++include_HEADERS = ISO_Fortran_binding.h
+ 
+ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
+ 	    $(lt_host_flags)
+ 
+-toolexeclib_LTLIBRARIES = libgfortran.la
+-toolexeclib_DATA = libgfortran.spec
++lib_LTLIBRARIES = libgfortran.la
++toolexeclib_DATA = libgfortran.spec # needs "exec" in name
+ libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS)
+ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+ 	$(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \
+@@ -58,16 +57,14 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+ 	$(version_arg) -Wc,-shared-libgcc
+ libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP)
+ 
+-cafexeclib_LTLIBRARIES = libcaf_single.la
+-cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
++lib_LTLIBRARIES += libcaf_single.la
+ libcaf_single_la_SOURCES = caf/single.c
+ libcaf_single_la_LDFLAGS = -static
+ libcaf_single_la_DEPENDENCIES = caf/libcaf.h
+ libcaf_single_la_LINK = $(LINK) $(libcaf_single_la_LDFLAGS)
+ 
+ if IEEE_SUPPORT
+-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
+-nodist_finclude_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod
++nodist_include_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod
+ endif
+ 
+ ## io.h conflicts with a system header on some platforms, so
+-- 
+2.47.2
+

pkgs/development/compilers/gcc/ng/15/libssp/force-regular-dirs.patch

@@ -0,0 +1,30 @@
+From e7dac0e90f3e4363d858a6f147d7cc4f62815dd6 Mon Sep 17 00:00:00 2001
+From: John Ericson <John.Ericson@Obsidian.Systems>
+Date: Fri, 18 Jul 2025 16:54:17 -0400
+Subject: [PATCH 3/3] Force regular dirs
+
+Override directories in libssp so they are normal $out/lib and
+$dev/include. This is not suitable for upstreaming, but is done on top
+of a different patch which is, and which makes this smaller.
+---
+ libssp/configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/libssp/configure.ac b/libssp/configure.ac
+index 5b9fa4fbecc..f1723dc33ce 100644
+--- a/libssp/configure.ac
++++ b/libssp/configure.ac
+@@ -207,10 +207,6 @@ esac
+ AC_SUBST(toolexecdir)
+ AC_SUBST(toolexeclibdir)
+ 
+-# Directory in which the compiler finds libraries etc.
+-libdir='$(toolexeclibdir)'
+-includedir=${orig_libdir}/gcc/${host_noncanonical}/'$(version)/include'
+-
+ if test ${multilib} = yes; then
+   multilib_arg="--enable-multilib"
+ else
+-- 
+2.47.2
+

pkgs/development/compilers/gcc/ng/15/libstdcxx/force-regular-dirs.patch

@@ -0,0 +1,120 @@
+From db427c55334dd2edc11397d3a92d55dc9c06d1c3 Mon Sep 17 00:00:00 2001
+From: John Ericson <git@JohnEricson.me>
+Date: Sun, 20 Jul 2025 14:20:00 -0400
+Subject: [PATCH] libstdc++: Force regular include/lib dir
+
+Delete a bunch of unneeded logic to do this.
+---
+ libstdc++-v3/acinclude.m4        | 80 ++------------------------------
+ libstdc++-v3/include/Makefile.am |  2 +-
+ 2 files changed, 4 insertions(+), 78 deletions(-)
+
+diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
+index a0094c2dd95..a0718dff394 100644
+--- a/libstdc++-v3/acinclude.m4
++++ b/libstdc++-v3/acinclude.m4
+@@ -727,85 +727,11 @@ dnl
+ dnl This logic must match gcc/configure.ac's setting of gcc_gxx_include_dir.
+ dnl config/gxx-include-dir.m4 must be kept consistant with this as well.
+ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
+-  glibcxx_toolexecdir=no
+-  glibcxx_toolexeclibdir=no
++  glibcxx_toolexecdir='$(libdir)'
++  glibcxx_toolexeclibdir='$(libdir)'
++  gxx_include_dir='$(includedir)'
+   glibcxx_prefixdir=$prefix
+ 
+-  AC_MSG_CHECKING([for gxx-include-dir])
+-  AC_ARG_WITH([gxx-include-dir],
+-    AC_HELP_STRING([--with-gxx-include-dir=DIR],
+-		   [installation directory for include files]),
+-    [case "$withval" in
+-      yes) AC_MSG_ERROR([Missing directory for --with-gxx-include-dir]) ;;
+-      no)  gxx_include_dir=no ;;
+-      *)   gxx_include_dir=$withval ;;
+-     esac],
+-    [gxx_include_dir=no])
+-  AC_MSG_RESULT($gxx_include_dir)
+-
+-  AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
+-  AC_ARG_ENABLE([version-specific-runtime-libs],
+-    AC_HELP_STRING([--enable-version-specific-runtime-libs],
+-		   [Specify that runtime libraries should be installed in a compiler-specific directory]),
+-    [case "$enableval" in
+-      yes) version_specific_libs=yes ;;
+-      no)  version_specific_libs=no ;;
+-      *)   AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
+-     esac],
+-    [version_specific_libs=no])
+-  AC_MSG_RESULT($version_specific_libs)
+-
+-  GCC_WITH_TOOLEXECLIBDIR
+-
+-  # Default case for install directory for include files.
+-  if test $version_specific_libs = no && test $gxx_include_dir = no; then
+-    gxx_include_dir='include/c++/${gcc_version}'
+-    if test -n "$with_cross_host" &&
+-       test x"$with_cross_host" != x"no"; then
+-      gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir"
+-    else
+-      gxx_include_dir='${prefix}/'"$gxx_include_dir"
+-    fi
+-  fi
+-
+-  # Version-specific runtime libs processing.
+-  if test $version_specific_libs = yes; then
+-    # Need the gcc compiler version to know where to install libraries
+-    # and header files if --enable-version-specific-runtime-libs option
+-    # is selected.  FIXME: these variables are misnamed, there are
+-    # no executables installed in _toolexecdir or _toolexeclibdir.
+-    if test x"$gxx_include_dir" = x"no"; then
+-      gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
+-    fi
+-    glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
+-    glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
+-  fi
+-
+-  # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
+-  # Install a library built with a cross compiler in tooldir, not libdir.
+-  if test x"$glibcxx_toolexecdir" = x"no"; then
+-    if test -n "$with_cross_host" &&
+-       test x"$with_cross_host" != x"no"; then
+-      glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
+-      case ${with_toolexeclibdir} in
+-	no)
+-	  glibcxx_toolexeclibdir='${toolexecdir}/lib'
+-	  ;;
+-	*)
+-	  glibcxx_toolexeclibdir=${with_toolexeclibdir}
+-	  ;;
+-      esac
+-    else
+-      glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
+-      glibcxx_toolexeclibdir='${libdir}'
+-    fi
+-    multi_os_directory=`$CXX -print-multi-os-directory`
+-    case $multi_os_directory in
+-      .) ;; # Avoid trailing /.
+-      *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
+-    esac
+-  fi
+-
+   AC_MSG_CHECKING([for install location])
+   AC_MSG_RESULT($gxx_include_dir)
+ 
+diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
+index 537774c2668..c0bfeb43b44 100644
+--- a/libstdc++-v3/include/Makefile.am
++++ b/libstdc++-v3/include/Makefile.am
+@@ -1048,7 +1048,7 @@ endif
+ 
+ host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
+ host_builddir = ./${host_alias}/bits
+-host_installdir = ${gxx_include_dir}/${host_alias}$(MULTISUBDIR)/bits
++host_installdir = ${gxx_include_dir}/bits
+ host_headers = \
+ 	${host_srcdir}/ctype_base.h \
+ 	${host_srcdir}/ctype_inline.h \
+-- 
+2.47.2
+