--enable-version-specific-runtime-libs fix

Geoffrey Keating gkeating@geoffk5.apple.com
Thu Feb 5 23:19:00 GMT 2004


There are a few obscure places where the former gcc-lib was being
referenced.  This fixes them.

Tested by installing a built tree with
--enable-version-specific-runtime-libs on powerpc-darwin and checking
that a simple C++ program still links.

-- 
- Geoffrey Keating <geoffk@apple.com>

===File ~/patches/gcc-12179.patch===========================
Index: libf2c/ChangeLog
Thu Feb  5 15:08:08 2004  Geoffrey Keating  <geoffk@apple.com>

	PR 12179
	* aclocal.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Use 'gcc', not 'gcc-lib'.
	Add comment about poorly-named variables.
	* Makefile.in (libsubdir): Use 'gcc', not 'gcc-lib'.
	* configure: Regenerate.

Index: libstdc++-v3/ChangeLog
2004-02-05  Geoffrey Keating  <geoffk@apple.com>

	PR 12179
	* .cvsignore: New.
	* acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): Use 'gcc', not
	'gcc-lib'.  Add comment about poorly-named variables.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

Index: libf2c/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libf2c/Makefile.in,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 Makefile.in
--- libf2c/Makefile.in	4 Jul 2003 19:45:54 -0000	1.57
+++ libf2c/Makefile.in	5 Feb 2004 23:14:20 -0000
@@ -42,7 +42,7 @@ glibcpp_toolexeclibdir = @glibcpp_toolex
 top_builddir = .
 
 libdir = $(exec_prefix)/lib
-libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
+libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
 #
 # Versions should start at 0:0:0 - See libtool manual.
 VERSION_MAJOR=0
Index: libf2c/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libf2c/aclocal.m4,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 aclocal.m4
--- libf2c/aclocal.m4	12 Mar 2003 21:34:19 -0000	1.7
+++ libf2c/aclocal.m4	5 Feb 2004 23:14:20 -0000
@@ -194,9 +194,10 @@ AC_SUBST(gcc_version_trigger)
 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.
+  # is selected.  FIXME: "toolexecdir" is a misnomer, there are no
+  # executables installed there.
   changequote(,)dnl
-  glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+  glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
   glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
   changequote([,])dnl
 fi
@@ -209,7 +210,7 @@ if test x"$glibcpp_toolexecdir" = x"no";
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
     glibcpp_toolexeclibdir='$(toolexecdir)/lib'
   else
-    glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+    glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
     glibcpp_toolexeclibdir='$(libdir)'
   fi
   multi_os_directory=`$CC -print-multi-os-directory`
Index: libstdc++-v3/.cvsignore
===================================================================
RCS file: libstdc++-v3/.cvsignore
diff -N libstdc++-v3/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libstdc++-v3/.cvsignore	5 Feb 2004 23:14:20 -0000
@@ -0,0 +1 @@
+autom4te.cache
Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.280
diff -u -p -u -p -r1.280 acinclude.m4
--- libstdc++-v3/acinclude.m4	29 Dec 2003 20:13:21 -0000	1.280
+++ libstdc++-v3/acinclude.m4	5 Feb 2004 23:14:20 -0000
@@ -762,11 +762,12 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
   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.
+    # 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-lib/${host_alias}/'$gcc_version/include/c++
+      gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
     fi
-    glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
+    glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
     glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
   fi
 
@@ -778,7 +779,7 @@ AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
       glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
       glibcxx_toolexeclibdir='${toolexecdir}/lib'
     else
-      glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
+      glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
       glibcxx_toolexeclibdir='${libdir}'
     fi
     multi_os_directory=`$CXX -print-multi-os-directory`
============================================================



More information about the Gcc-patches mailing list