summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac3
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ac28baf7018..bc19a7707b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-10 Ian Lance Taylor <iant@google.com>
+
+ PR bootstrap/46819
+ * configure.ac: For --disable-libgcj clear libgcj_saved.
+ * configure: Rebuild.
+
2010-12-10 Tobias Burnus <burnus@net-b.de>
PR fortran/46540
diff --git a/configure b/configure
index 4280d9778da..9f036cb418a 100755
--- a/configure
+++ b/configure
@@ -3055,6 +3055,9 @@ no)
# Make sure we get it printed in the list of not supported target libs.
# Don't disable libffi, though, other languages use it.
noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
+ # Clear libgcj_saved so that even if java is enabled libffi won't be
+ # built.
+ libgcj_saved=
;;
esac
diff --git a/configure.ac b/configure.ac
index 03f15dfa8a5..fc268b2a5ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,6 +506,9 @@ no)
# Make sure we get it printed in the list of not supported target libs.
# Don't disable libffi, though, other languages use it.
noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
+ # Clear libgcj_saved so that even if java is enabled libffi won't be
+ # built.
+ libgcj_saved=
;;
esac