git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config-ml.in: Add Go support... 

* config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
	compiler/flag environment variables.

From-SVN: r166956
This commit is contained in:
Ian Lance Taylor 2010-11-19 20:25:49 +00:00 committed by Ian Lance Taylor
parent 535bd17c2f
commit ce59187eb8
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-11-19 Ian Lance Taylor <iant@google.com>
* config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
compiler/flag environment variables.
2010-11-18 Ian Lance Taylor <iant@google.com> 2010-11-18 Ian Lance Taylor <iant@google.com>
* configure.ac: Check for lang_requires_boot_languages in * configure.ac: Check for lang_requires_boot_languages in

18
config-ml.in
View File

@ -2,7 +2,7 @@
# wanting multilib support. # wanting multilib support.
# #
# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 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 # 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 # it under the terms of the GNU General Public License as published by
@ -517,6 +517,7 @@ multi-do:
prefix="$(prefix)" \ prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \ exec_prefix="$(exec_prefix)" \
GCJFLAGS="$(GCJFLAGS) $${flags}" \ GCJFLAGS="$(GCJFLAGS) $${flags}" \
GOCFLAGS="$(GOCFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \ CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \ LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \ LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
@ -750,7 +751,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
break break
fi fi
done 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 if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' ' CC_=$CC' '
@ -758,6 +759,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
F77_=$F77' ' F77_=$F77' '
GCJ_=$GCJ' ' GCJ_=$GCJ' '
GFORTRAN_=$GFORTRAN' ' GFORTRAN_=$GFORTRAN' '
GOC_=$GOC' '
else else
# Create a regular expression that matches any string as long # Create a regular expression that matches any string as long
# as ML_POPDIR. # as ML_POPDIR.
@ -822,6 +824,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
esac esac
done 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 if test "x${LD_LIBRARY_PATH+set}" = xset; then
LD_LIBRARY_PATH_= LD_LIBRARY_PATH_=
for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do