summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/acinclude.m42
-rw-r--r--libstdc++-v3/aclocal.m42
-rwxr-xr-xlibstdc++-v3/configure2
4 files changed, 10 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index eef8140eedd..e6bc02a02e5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-15 Anthony Green <green@redhat.com>
+
+ * acinclude.m4 (glibcpp_toolexeclibdir): Fix test for cross
+ compilation.
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2001-02-15 Rodney Brown <RodneyBrown@mynd.com>
* acinclude.m4 (GLIBCPP_CHECK_MATH_DECL_1):
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 81ef3c09030..0c87780ccb2 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1569,7 +1569,7 @@ fi
# 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
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index d92314c5de9..a4a5e0ade43 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1581,7 +1581,7 @@ fi
# 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
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 4cfd4657aa4..e74ea1bf88b 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15954,7 +15954,7 @@ fi
# 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