summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorespindola <espindola@138bc75d-0d04-0410-961f-82ee72b054a4>2008-05-14 17:15:51 +0000
committerespindola <espindola@138bc75d-0d04-0410-961f-82ee72b054a4>2008-05-14 17:15:51 +0000
commit2c3fa25d8f249889b308a872a787d053a3176c48 (patch)
tree1e73eac0f526de693bf5977a4ee72cfe345c95a3
parent2dd6f9ed8b4ff11744743be3b8abcc81b461cd59 (diff)
downloadgcc-2c3fa25d8f249889b308a872a787d053a3176c48.tar.gz
2008-05-14 Rafael Espindola <espindola@google.com>
* config-ml.in: don't handle --enable-shared and --enable-static. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135300 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--ChangeLog4
-rw-r--r--config-ml.in7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ac9bcf5e27..6b5823907b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14 Rafael Espindola <espindola@google.com>
+
+ * config-ml.in: don't handle --enable-shared and --enable-static.
+
2008-05-10 Richard Sandiford <rdsandiford@googlemail.com>
* MAINTAINERS: Update my email address.
diff --git a/config-ml.in b/config-ml.in
index 3ae19743b76..f2497ada4f8 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -135,7 +135,12 @@ do
*) optarg=yes ;;
esac
enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
- eval $enableopt="$optarg"
+ # enable_shared and enable_static are handled by configure.
+ # Don't undo its work.
+ case $enableopt in
+ enable_shared | enable_static) ;;
+ *) eval $enableopt="$optarg" ;;
+ esac
;;
--norecursion | --no-recursion)
ml_norecursion=yes