[patch] multilibs with --enable-version-specific-runtime-libs

Hidvegi hzoli@austin.ibm.com
Thu Feb 8 21:38:00 GMT 2001


--enable-version-specific-runtime-libs does not work with multilibs,
fix is below.

Zoli


 Index: libstdc++-v3/acinclude.m4
 ===================================================================
 RCS file: /cvs/gcc/egcs/libstdc++-v3/acinclude.m4,v
 retrieving revision 1.129
 diff -c -r1.129 acinclude.m4
 *** acinclude.m4	2001/02/07 01:54:17	1.129
 --- acinclude.m4	2001/02/08 20:57:35
 ***************
 *** 1551,1557 ****
   gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
   gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
   glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
 ! glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}
   changequote([,])dnl
   ],version_specific_libs=no)
   AC_MSG_RESULT($version_specific_libs)
 --- 1551,1557 ----
   gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
   gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
   glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
 ! glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
   changequote([,])dnl
   ],version_specific_libs=no)
   AC_MSG_RESULT($version_specific_libs)
 Index: libstdc++-v3/aclocal.m4
 ===================================================================
 RCS file: /cvs/gcc/egcs/libstdc++-v3/aclocal.m4,v
 retrieving revision 1.132
 diff -c -r1.132 aclocal.m4
 *** aclocal.m4	2001/02/07 01:54:17	1.132
 --- aclocal.m4	2001/02/08 20:57:37
 ***************
 *** 1563,1569 ****
   gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
   gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
   glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
 ! glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}
   changequote([,])dnl
   ],version_specific_libs=no)
   AC_MSG_RESULT($version_specific_libs)
 --- 1563,1569 ----
   gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
   gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
   glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
 ! glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
   changequote([,])dnl
   ],version_specific_libs=no)
   AC_MSG_RESULT($version_specific_libs)
 Index: libstdc++-v3/configure
 ===================================================================
 RCS file: /cvs/gcc/egcs/libstdc++-v3/configure,v
 retrieving revision 1.147
 diff -c -r1.147 configure
 *** configure	2001/02/07 01:54:17	1.147
 --- configure	2001/02/08 20:57:45
 ***************
 *** 15755,15761 ****
   gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
   gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
   glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
 ! glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}
   
   else
     version_specific_libs=no
 --- 15755,15761 ----
   gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
   gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
   glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
 ! glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
   
   else
     version_specific_libs=no



More information about the Gcc-patches mailing list