[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-242-g6f1e8cc

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=6f1e8ccb0b9289646c84be03f7ea42a7bbb2154d

The branch, maint has been updated
       via  6f1e8ccb0b9289646c84be03f7ea42a7bbb2154d (commit)
      from  15cd54c001e1510c6593adfd3391f69d4bcc9c45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f1e8ccb0b9289646c84be03f7ea42a7bbb2154d
Author: Ian Lance Taylor <address@hidden>
Date:   Fri Nov 19 21:50:31 2010 +0100

    Sync config-ml.in from GCC.
    
    * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
    compiler/flag environment variables.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    6 ++++++
 lib/config-ml.in |   18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fbc114e..4f05950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-19  Ian Lance Taylor  <address@hidden>
+
+       Sync config-ml.in from GCC.
+       * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
+       compiler/flag environment variables.
+
 2010-11-19  Stefano Lattarini  <address@hidden>
 
        Automake::Config: remove extra trailing semicolon.
diff --git a/lib/config-ml.in b/lib/config-ml.in
index f2497ad..2dd0d51 100644
--- a/lib/config-ml.in
+++ b/lib/config-ml.in
@@ -2,7 +2,7 @@
 # wanting multilib support.
 #
 # Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2010  Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -517,6 +517,7 @@ multi-do:
                                prefix="$(prefix)" \
                                exec_prefix="$(exec_prefix)" \
                                GCJFLAGS="$(GCJFLAGS) $${flags}" \
+                               GOCFLAGS="$(GOCFLAGS) $${flags}" \
                                CXXFLAGS="$(CXXFLAGS) $${flags}" \
                                LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
                                LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
@@ -750,7 +751,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
         break
       fi
     done
-    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" 
GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"'
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" 
GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
 
     if [ "${with_target_subdir}" = "." ]; then
        CC_=$CC' '
@@ -758,6 +759,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
        F77_=$F77' '
        GCJ_=$GCJ' '
        GFORTRAN_=$GFORTRAN' '
+       GOC_=$GOC' '
     else
        # Create a regular expression that matches any string as long
        # as ML_POPDIR.
@@ -822,6 +824,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; 
then
          esac
        done
 
+       GOC_=
+       for arg in ${GOC}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           GOC_="${GOC_}"`echo "X${arg}" | sed -n 
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           GOC_="${GOC_}"`echo "X${arg}" | sed -n 
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n 
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           GOC_="${GOC_}${arg} " ;;
+         esac
+       done
+
        if test "x${LD_LIBRARY_PATH+set}" = xset; then
          LD_LIBRARY_PATH_=
          for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do


hooks/post-receive
-- 
GNU Automake