diff options
| author | Jan-Benedict Glaw <jbglaw@lug-owl.de> | 2014-10-31 11:03:57 +0000 |
|---|---|---|
| committer | Jan-Benedict Glaw <jbglaw@gcc.gnu.org> | 2014-10-31 11:03:57 +0000 |
| commit | 1335a8caf760e49d687866541cda051bd9651289 (patch) | |
| tree | d83fa830d8f3233b2e9af9af67e215467678236f | |
| parent | 71ff3d1820751c2e0f5dd265603ab8640b0cea63 (diff) | |
| download | gcc-1335a8caf760e49d687866541cda051bd9651289.zip gcc-1335a8caf760e49d687866541cda051bd9651289.tar.gz gcc-1335a8caf760e49d687866541cda051bd9651289.tar.bz2 | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | contrib/ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/config-list.mk | 23 |
5 files changed, 32 insertions, 8 deletions
@@ -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. @@ -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 d8262f8..2f0af4a 100644 --- 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 b340f87..3878803 100644 --- 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 94884d9..16900e1 100644 --- 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 $< |