diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | configure | 8 | ||||
-rw-r--r-- | configure.ac | 8 |
3 files changed, 12 insertions, 8 deletions
@@ -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. @@ -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 02174b3..9bee624 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 |