diff options
| author | jbglaw <jbglaw@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-31 11:03:57 +0000 |
|---|---|---|
| committer | jbglaw <jbglaw@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-31 11:03:57 +0000 |
| commit | 10e64fba70ca8c7c4ca0e221b89a65d5c086f433 (patch) | |
| tree | d83fa830d8f3233b2e9af9af67e215467678236f /contrib | |
| parent | d4316989652a3308305b9cd873a95269a4583ec1 (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216957 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/config-list.mk | 23 |
2 files changed, 22 insertions, 5 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index b340f875f36..3878803bdf2 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 94884d9b255..16900e19e53 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 $< |