Fix cross builds.

From-SVN: r42497

Fix cross builds.
From-SVN: r42497
13094d12 · Anthony Green · Anthony Green · 1ec07597 · 13094d12 · 13094d12
Commit 13094d12 authored May 23, 2001 by Anthony Green Committed by Anthony Green May 23, 2001
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

libjava/ChangeLog
+5 -0

libjava/configure
+0 -0

libjava/configure.in
+1 -3

No files found.
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
+2001-05-22  Anthony Green  <green@redhat.com>
+
+	* configure.in: Tweak canadian cross test, and don't redefine GCJ
+	for cross builds.
+
 2001-05-21  Per Bothner  <per@bothner.com>

 	Implement invocation interface; don't create new thread for main.

--- a/libjava/configure
+++ b/libjava/configure
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -374,12 +374,10 @@ if test -n "${with_cross_host}"; then

   # If Canadian cross, then don't pick up tools from the build
   # directory.
-   if test "$build" != "$with_cross_host"; then
+   if test x"$build" != x"$with_cross_host" && x"$build" != x"$target"; then
      CANADIAN=yes
      GCC_UNWIND_INCLUDE=
      GCJ="${target_alias}-gcj"
-   else
-      GCJ=
   fi
   NATIVE=no
 else