This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


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

v3 patch: installation fix



Cross toolchains were installing the v3 library in libdir instead of
toolexeclibdir.  The problem is that we were comparing
$with_cross_host to `yes' when it is normally set to the triple of the
host for the cross build.

Ok for trunk and branch?

2001-02-15  Anthony Green  <green@redhat.com>

	* acinclude.m4 (glibcpp_toolexeclibdir): Fix test for cross
	compilation.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.129
diff -c -u -r1.129 acinclude.m4
--- acinclude.m4	2001/02/07 01:54:17	1.129
+++ acinclude.m4	2001/02/15 13:35:22
@@ -1565,7 +1565,8 @@
 # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
 if test x"$glibcpp_toolexecdir" = x"no"; then 
-  if test x"$with_cross_host" = x"yes"; then
+  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)'
   else
Index: libstdc++-v3/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/aclocal.m4,v
retrieving revision 1.132
diff -c -u -r1.132 aclocal.m4
--- aclocal.m4	2001/02/07 01:54:17	1.132
+++ aclocal.m4	2001/02/15 13:35:27
@@ -1577,7 +1577,8 @@
 # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
 if test x"$glibcpp_toolexecdir" = x"no"; then 
-  if test x"$with_cross_host" = x"yes"; then
+  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)'
   else
Index: libstdc++-v3/configure
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure,v
retrieving revision 1.148
diff -c -u -r1.148 configure
--- configure	2001/02/11 18:15:47	1.148
+++ configure	2001/02/15 13:36:03
@@ -15805,7 +15805,8 @@
 # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
 if test x"$glibcpp_toolexecdir" = x"no"; then 
-  if test x"$with_cross_host" = x"yes"; then
+  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)'
   else
@@ -15815,7 +15816,7 @@
 fi
 
 echo $ac_n "checking for install location""... $ac_c" 1>&6
-echo "configure:15819: checking for install location" >&5
+echo "configure:15787: checking for install location" >&5
 echo "$ac_t""$gxx_include_dir" 1>&6


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