This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

libstdc++ multilibs installed where gcc won't find them


I've run into a problem in the mips64-linux-gnu port: at least in the
cross-build setting, gcc installs the shared libstdc++.so in directory
names that follow the multilib subdir naming convention (. /32 /64),
but then gcc looks for it in a directory named after the OS-specific
multilib dir (../lib ../lib32 ../lib64), so it doesn't work.  This
patch fixes this problem, by arranging for libstdc++-v3 to install the
multilibs in the same location where gcc will find them.  Ok to
install?

Index: libstdc++-v3/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* acinclude.m4 (glibcpp_toolexeclibdir): Instead of
	$(MULTISUBDIR), use `$CC -print-multi-os-directory`, unless
	version_specific_libs is enabled.
	* aclocal.m4, configure: Rebuilt.

Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/uberbaum/libstdc++-v3/acinclude.m4,v
retrieving revision 1.228
diff -u -p -r1.228 acinclude.m4
--- libstdc++-v3/acinclude.m4 16 Jan 2003 00:50:11 -0000 1.228
+++ libstdc++-v3/acinclude.m4 26 Jan 2003 03:18:09 -0000
@@ -1963,11 +1963,12 @@ if test x"$glibcpp_toolexecdir" = x"no";
   if test -n "$with_cross_host" &&
      test x"$with_cross_host" != x"no"; then
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
-    glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)'
+    glibcpp_toolexeclibdir='$(toolexecdir)/lib'
   else
     glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-    glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)'
+    glibcpp_toolexeclibdir='$(libdir)'
   fi
+  glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory`
 fi
 
 AC_MSG_CHECKING([for install location])
-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]