pyrox.dev
1From db427c55334dd2edc11397d3a92d55dc9c06d1c3 Mon Sep 17 00:00:00 2001
2From: John Ericson <git@JohnEricson.me>
3Date: Sun, 20 Jul 2025 14:20:00 -0400
4Subject: [PATCH] libstdc++: Force regular include/lib dir
5
6Delete a bunch of unneeded logic to do this.
7---
8 libstdc++-v3/acinclude.m4 | 80 ++------------------------------
9 libstdc++-v3/include/Makefile.am | 2 +-
10 2 files changed, 4 insertions(+), 78 deletions(-)
11
12diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
13index a0094c2dd95..a0718dff394 100644
14--- a/libstdc++-v3/acinclude.m4
15+++ b/libstdc++-v3/acinclude.m4
16@@ -727,85 +727,11 @@ dnl
17 dnl This logic must match gcc/configure.ac's setting of gcc_gxx_include_dir.
18 dnl config/gxx-include-dir.m4 must be kept consistant with this as well.
19 AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
20- glibcxx_toolexecdir=no
21- glibcxx_toolexeclibdir=no
22+ glibcxx_toolexecdir='$(libdir)'
23+ glibcxx_toolexeclibdir='$(libdir)'
24+ gxx_include_dir='$(includedir)'
25 glibcxx_prefixdir=$prefix
26
27- AC_MSG_CHECKING([for gxx-include-dir])
28- AC_ARG_WITH([gxx-include-dir],
29- AC_HELP_STRING([--with-gxx-include-dir=DIR],
30- [installation directory for include files]),
31- [case "$withval" in
32- yes) AC_MSG_ERROR([Missing directory for --with-gxx-include-dir]) ;;
33- no) gxx_include_dir=no ;;
34- *) gxx_include_dir=$withval ;;
35- esac],
36- [gxx_include_dir=no])
37- AC_MSG_RESULT($gxx_include_dir)
38-
39- AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
40- AC_ARG_ENABLE([version-specific-runtime-libs],
41- AC_HELP_STRING([--enable-version-specific-runtime-libs],
42- [Specify that runtime libraries should be installed in a compiler-specific directory]),
43- [case "$enableval" in
44- yes) version_specific_libs=yes ;;
45- no) version_specific_libs=no ;;
46- *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
47- esac],
48- [version_specific_libs=no])
49- AC_MSG_RESULT($version_specific_libs)
50-
51- GCC_WITH_TOOLEXECLIBDIR
52-
53- # Default case for install directory for include files.
54- if test $version_specific_libs = no && test $gxx_include_dir = no; then
55- gxx_include_dir='include/c++/${gcc_version}'
56- if test -n "$with_cross_host" &&
57- test x"$with_cross_host" != x"no"; then
58- gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir"
59- else
60- gxx_include_dir='${prefix}/'"$gxx_include_dir"
61- fi
62- fi
63-
64- # Version-specific runtime libs processing.
65- if test $version_specific_libs = yes; then
66- # Need the gcc compiler version to know where to install libraries
67- # and header files if --enable-version-specific-runtime-libs option
68- # is selected. FIXME: these variables are misnamed, there are
69- # no executables installed in _toolexecdir or _toolexeclibdir.
70- if test x"$gxx_include_dir" = x"no"; then
71- gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
72- fi
73- glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
74- glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
75- fi
76-
77- # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
78- # Install a library built with a cross compiler in tooldir, not libdir.
79- if test x"$glibcxx_toolexecdir" = x"no"; then
80- if test -n "$with_cross_host" &&
81- test x"$with_cross_host" != x"no"; then
82- glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
83- case ${with_toolexeclibdir} in
84- no)
85- glibcxx_toolexeclibdir='${toolexecdir}/lib'
86- ;;
87- *)
88- glibcxx_toolexeclibdir=${with_toolexeclibdir}
89- ;;
90- esac
91- else
92- glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
93- glibcxx_toolexeclibdir='${libdir}'
94- fi
95- multi_os_directory=`$CXX -print-multi-os-directory`
96- case $multi_os_directory in
97- .) ;; # Avoid trailing /.
98- *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
99- esac
100- fi
101-
102 AC_MSG_CHECKING([for install location])
103 AC_MSG_RESULT($gxx_include_dir)
104
105diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
106index 537774c2668..c0bfeb43b44 100644
107--- a/libstdc++-v3/include/Makefile.am
108+++ b/libstdc++-v3/include/Makefile.am
109@@ -1048,7 +1048,7 @@ endif
110
111 host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
112 host_builddir = ./${host_alias}/bits
113-host_installdir = ${gxx_include_dir}/${host_alias}$(MULTISUBDIR)/bits
114+host_installdir = ${gxx_include_dir}/bits
115 host_headers = \
116 ${host_srcdir}/ctype_base.h \
117 ${host_srcdir}/ctype_inline.h \
118--
1192.47.2
120