mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 05:44:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure.ac: Remove code setting CONFIG_SHELL, config_shell and moveifchange.

Browse Source 
* configure.ac: Remove code setting CONFIG_SHELL, config_shell and
	moveifchange.
	* configure: Regenerate.
	* Makefile.tpl: Use @SHELL@ not @config_shell@.
	* Makefile.in: Regenerate.

From-SVN: r171830
This commit is contained in:
Joseph Myers 2011-04-01 14:43:39 +01:00 committed by Joseph Myers
parent 6de6637049
commit 72691ba6f1
5 changed files with 10 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-04-01 Joseph Myers <joseph@codesourcery.com>
* configure.ac: Remove code setting CONFIG_SHELL, config_shell and
moveifchange.
* configure: Regenerate.
* Makefile.tpl: Use @SHELL@ not @config_shell@.
* Makefile.in: Regenerate.
2011-04-01 Joseph Myers <joseph@codesourcery.com>
* configure.ac (*-*-sysv4*): Don't enable libgomp.

2
Makefile.in
View File

@ -320,7 +320,7 @@ HOST_LIBELFINC = @libelfinc@
# Programs producing files for the BUILD machine
# ----------------------------------------------
SHELL = @config_shell@
SHELL = @SHELL@
# pwd command to use. Allow user to override default by setting PWDCMD in
# the environment to account for automounters. The make variable must not

2
Makefile.tpl
View File

@ -323,7 +323,7 @@ HOST_LIBELFINC = @libelfinc@
# Programs producing files for the BUILD machine
# ----------------------------------------------
SHELL = @config_shell@
SHELL = @SHELL@
# pwd command to use. Allow user to override default by setting PWDCMD in
# the environment to account for automounters. The make variable must not

38
configure vendored
View File

@ -604,7 +604,6 @@ LEX
M4
BISON
YACC
config_shell
WINDRES_FOR_BUILD
WINDMC_FOR_BUILD
RANLIB_FOR_BUILD
@ -2608,42 +2607,6 @@ fi
done
### we might need to use some other shell than /bin/sh for running subshells
### If we are on Windows, search for the shell. This will permit people
### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure
### without also having to set CONFIG_SHELL. This code will work when
### using bash, which sets OSTYPE.
case "${OSTYPE}" in
*win32*)
if test x${CONFIG_SHELL} = x ; then
if test ! -f /bin/sh ; then
if test x${SHELL} != x && test -f ${SHELL} ; then
CONFIG_SHELL=${SHELL}
export CONFIG_SHELL
else
for prog in sh sh.exe bash bash.exe; do
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
for dir in $PATH; do
test -z "$dir" && dir=.
if test -f $dir/$prog; then
CONFIG_SHELL=$dir/$prog
export CONFIG_SHELL
break
fi
done
IFS="$save_ifs"
test -n "${CONFIG_SHELL}" && break
done
fi
fi
fi
;;
esac
config_shell=${CONFIG_SHELL-/bin/sh}
moveifchange=${srcdir}/move-if-change
srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
# We pass INSTALL explicitly to sub-makes. Make sure that it is not
@ -7507,7 +7470,6 @@ done
# Generate default definitions for YACC, M4, LEX and other programs that run
# on the build machine. These are used if the Makefile can't locate these
# programs in objdir.

37
configure.ac
View File

@ -89,42 +89,6 @@ AC_PROG_LN_S
AC_PROG_SED
AC_PROG_AWK
### we might need to use some other shell than /bin/sh for running subshells
### If we are on Windows, search for the shell. This will permit people
### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure
### without also having to set CONFIG_SHELL. This code will work when
### using bash, which sets OSTYPE.
case "${OSTYPE}" in
*win32*)
if test x${CONFIG_SHELL} = x ; then
if test ! -f /bin/sh ; then
if test x${SHELL} != x && test -f ${SHELL} ; then
CONFIG_SHELL=${SHELL}
export CONFIG_SHELL
else
for prog in sh sh.exe bash bash.exe; do
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
for dir in $PATH; do
test -z "$dir" && dir=.
if test -f $dir/$prog; then
CONFIG_SHELL=$dir/$prog
export CONFIG_SHELL
break
fi
done
IFS="$save_ifs"
test -n "${CONFIG_SHELL}" && break
done
fi
fi
fi
;;
esac
config_shell=${CONFIG_SHELL-/bin/sh}
moveifchange=${srcdir}/move-if-change
srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
# We pass INSTALL explicitly to sub-makes. Make sure that it is not
@ -2985,7 +2949,6 @@ AC_SUBST(NM_FOR_BUILD)
AC_SUBST(RANLIB_FOR_BUILD)
AC_SUBST(WINDMC_FOR_BUILD)
AC_SUBST(WINDRES_FOR_BUILD)
AC_SUBST(config_shell)
# Generate default definitions for YACC, M4, LEX and other programs that run
# on the build machine. These are used if the Makefile can't locate these