diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-04 18:49:41 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-04 18:49:41 +0000 |
| commit | a2ecd49cb267c411a4501a493249b4236218e1a7 (patch) | |
| tree | 79bf226ee6d3c8e12e8919be347260dc233d36e2 | |
| parent | b3c9def6350231a8e1c80616c2430e6b71037d63 (diff) | |
| download | gcc-a2ecd49cb267c411a4501a493249b4236218e1a7.tar.gz | |
* configure.ac: Fix --enable-languages=all.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190945 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index f3132b4f06d..86c63a21668 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-09-04 Jason Merrill <jason@redhat.com> + + * configure.ac: Fix --enable-languages=all. + 2012-09-04 Christophe Lyon <christophe.lyon@st.com> * MAINTAINERS (Write After Approval): Add myself. diff --git a/configure b/configure index 0f655b8640b..cd06e4ef0d6 100755 --- a/configure +++ b/configure @@ -6112,6 +6112,7 @@ if test -d ${srcdir}/gcc; then boot_language=yes fi + add_this_lang=no case ,${enable_languages}, in *,${language},*) # Language was explicitly selected; include it @@ -6122,10 +6123,9 @@ if test -d ${srcdir}/gcc; then ;; *,all,*) # 'all' was selected, select it if it is a default language - add_this_lang=${build_by_default} - ;; - *) - add_this_lang=no + if test "$language" != "c"; then + add_this_lang=${build_by_default} + fi ;; esac diff --git a/configure.ac b/configure.ac index 02174b387bc..9bee624ec1c 100644 --- a/configure.ac +++ b/configure.ac @@ -1758,6 +1758,7 @@ if test -d ${srcdir}/gcc; then boot_language=yes fi + add_this_lang=no case ,${enable_languages}, in *,${language},*) # Language was explicitly selected; include it @@ -1768,10 +1769,9 @@ if test -d ${srcdir}/gcc; then ;; *,all,*) # 'all' was selected, select it if it is a default language - add_this_lang=${build_by_default} - ;; - *) - add_this_lang=no + if test "$language" != "c"; then + add_this_lang=${build_by_default} + fi ;; esac |