configure.ac: Update comment.

2014-10-31  Jan-Benedict Glaw  <jbglaw@lug-owl.de>

./	* configure.ac: Update comment.
	* configure: Regenerate.

./contrib	* config-list.mk: Don't build Go for certain targets.

From-SVN: r216957

diff --git a/ChangeLog b/ChangeLog
index 4b7d0649541a72983c53615863bf2493fa47115d..c9f79623f81557f26ba77d61d451f52097d6650d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-31  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+       * configure.ac: Update comment.
+       * configure: Regenerate.
+
 2014-10-31  Ilya Enkovich  <ilya.enkovich@intel.com>
 
        * MAINTAINERS (Write After Approval): Add myself.

diff --git a/configure b/configure
index 3eab122bdc91705e0d6d1f3227a969fa3d8b721d..d0c760bba49507820511e710a9244975559e1570 100755 (executable)
--- a/configure
+++ b/configure
@@ -3413,7 +3413,8 @@ case "${target}" in
     ;;
 esac
 
-# Disable the go frontend on systems where it is known to not work.
+# Disable the go frontend on systems where it is known to not work. Please keep
+# this in sync with contrib/config-list.mk.
 case "${target}" in
 *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
     unsupported_languages="$unsupported_languages go"

diff --git a/configure.ac b/configure.ac
index d8262f8a9105cd2a1749311b7eaa5cb77da5c76a..2f0af4a836f43c0f847055eb6674b316a6a6a4b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -769,10 +769,11 @@ case "${target}" in
     ;;
   *-*-lynxos*)
     noconfigdirs="$noconfigdirs ${libgcj}"
-    ;; 
+    ;;
 esac
 
-# Disable the go frontend on systems where it is known to not work.
+# Disable the go frontend on systems where it is known to not work. Please keep
+# this in sync with contrib/config-list.mk.
 case "${target}" in
 *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
     unsupported_languages="$unsupported_languages go"

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b340f875f360e403d788eaeaba471551701d0dbc..3878803bdf2ed7ad9e35550b534c62fc2e4ea003 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-31  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+       * config-list.mk: Don't build Go for certain targets.
+
 2014-10-04  Trevor Saunders  <tsaunders@mozilla.com>
 
        * compare-all-tests: Don't test score-*.

diff --git a/contrib/config-list.mk b/contrib/config-list.mk
index 94884d9b25529422932e909f32d5486b964df034..16900e19e5307166c953aeeec48241c589971d81 100644 (file)
--- a/contrib/config-list.mk
+++ b/contrib/config-list.mk
@@ -95,11 +95,24 @@ make-log-dir: ../gcc/MAINTAINERS
 
 $(LIST): make-log-dir
        -mkdir $@
-       (cd $@ && \
-       ../../gcc/configure \
-       --target=$(subst SCRIPTS,`pwd`/../scripts/,$(subst OPT,$(empty) -,$@)) \
-       --enable-werror-always ${host_options} --enable-languages=all,ada,go) \
-       > log/$@-config.out 2>&1
+       (                                                                                       \
+               cd $@ &&                                                                        \
+               echo $@ &&                                                                      \
+               TGT=`echo $@ | sed -e 's/^\(.*\)OPT.*$$/\1/'` &&                                \
+               TGT=`../../gcc/config.sub $$TGT` &&                                             \
+               case $$TGT in                                                                   \
+                       *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)                      \
+                               ADDITIONAL_LANGUAGES="";                                        \
+                               ;;                                                              \
+                       *)                                                                      \
+                               ADDITIONAL_LANGUAGES=",go";                                     \
+                               ;;                                                              \
+               esac &&                                                                         \
+               ../../gcc/configure                                                             \
+                       --target=$(subst SCRIPTS,`pwd`/../scripts/,$(subst OPT,$(empty) -,$@))  \
+                       --enable-werror-always ${host_options}                                  \
+                       --enable-languages=all,ada$$ADDITIONAL_LANGUAGES;                       \
+       ) > log/$@-config.out 2>&1
 
 $(LOGFILES) : log/%-make.out : %
        -$(MAKE) -C $< $(TEST) > $@ 2>&1 && rm -rf $<