Commit 53fbfb58 by Nathanael Nerode

Makefile.tpl: Fix dramatic bustage due to change in program_transform_name.

	* Makefile.tpl: Fix dramatic bustage due to change in
	program_transform_name.
	* Makefile.in: Regenerate.

	* configure.in: Remove unnecessary PATH setting.
	* configure: Regnerate.

	* configure.in: Don't default to unprefixed tools unless
	the native tools will work.
	* configure: Regenerate.

From-SVN: r60568
parent 1dd0faf3
2002-12-28 Nathanael Nerode <neroden@gcc.gnu.org> 2002-12-28 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Fix dramatic bustage due to change in
program_transform_name.
* Makefile.in: Regenerate.
* configure.in: Remove unnecessary PATH setting.
* configure: Regnerate.
* configure.in: Don't default to unprefixed tools unless
the native tools will work.
* configure: Regenerate.
* configure.in: Convert to autoconf script. Blow away lots * configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments. of now-redundant Makefile fragments.
* configure: Generate using Autoconf. * configure: Generate using Autoconf.
......
...@@ -279,7 +279,7 @@ USUAL_AS_FOR_TARGET = ` \ ...@@ -279,7 +279,7 @@ USUAL_AS_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AS); \ echo $(AS); \
else \ else \
t='$(program_transform_name)'; echo as | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo as | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -293,7 +293,7 @@ USUAL_LD_FOR_TARGET = ` \ ...@@ -293,7 +293,7 @@ USUAL_LD_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(LD); \ echo $(LD); \
else \ else \
t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo ld | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -305,7 +305,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \ ...@@ -305,7 +305,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(DLLTOOL); \ echo $(DLLTOOL); \
else \ else \
t='$(program_transform_name)'; echo dlltool | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -317,7 +317,7 @@ USUAL_WINDRES_FOR_TARGET = ` \ ...@@ -317,7 +317,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(WINDRES); \ echo $(WINDRES); \
else \ else \
t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo windres | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -329,7 +329,7 @@ USUAL_AR_FOR_TARGET = ` \ ...@@ -329,7 +329,7 @@ USUAL_AR_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AR); \ echo $(AR); \
else \ else \
t='$(program_transform_name)'; echo ar | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo ar | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -345,7 +345,7 @@ USUAL_RANLIB_FOR_TARGET = ` \ ...@@ -345,7 +345,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
echo ranlib; \ echo ranlib; \
fi; \ fi; \
else \ else \
t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -359,7 +359,7 @@ USUAL_NM_FOR_TARGET = ` \ ...@@ -359,7 +359,7 @@ USUAL_NM_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(NM); \ echo $(NM); \
else \ else \
t='$(program_transform_name)'; echo nm | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo nm | sed -e $$t ; \
fi; \ fi; \
fi` fi`
......
...@@ -282,7 +282,7 @@ USUAL_AS_FOR_TARGET = ` \ ...@@ -282,7 +282,7 @@ USUAL_AS_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AS); \ echo $(AS); \
else \ else \
t='$(program_transform_name)'; echo as | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo as | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -296,7 +296,7 @@ USUAL_LD_FOR_TARGET = ` \ ...@@ -296,7 +296,7 @@ USUAL_LD_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(LD); \ echo $(LD); \
else \ else \
t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo ld | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -308,7 +308,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \ ...@@ -308,7 +308,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(DLLTOOL); \ echo $(DLLTOOL); \
else \ else \
t='$(program_transform_name)'; echo dlltool | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -320,7 +320,7 @@ USUAL_WINDRES_FOR_TARGET = ` \ ...@@ -320,7 +320,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(WINDRES); \ echo $(WINDRES); \
else \ else \
t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo windres | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -332,7 +332,7 @@ USUAL_AR_FOR_TARGET = ` \ ...@@ -332,7 +332,7 @@ USUAL_AR_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AR); \ echo $(AR); \
else \ else \
t='$(program_transform_name)'; echo ar | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo ar | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -348,7 +348,7 @@ USUAL_RANLIB_FOR_TARGET = ` \ ...@@ -348,7 +348,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
echo ranlib; \ echo ranlib; \
fi; \ fi; \
else \ else \
t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
fi; \ fi; \
fi` fi`
...@@ -362,7 +362,7 @@ USUAL_NM_FOR_TARGET = ` \ ...@@ -362,7 +362,7 @@ USUAL_NM_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(NM); \ echo $(NM); \
else \ else \
t='$(program_transform_name)'; echo nm | sed -e 's/x/x/' $$t ; \ t='$(program_transform_name)'; echo nm | sed -e $$t ; \
fi; \ fi; \
fi` fi`
......
...@@ -80,14 +80,6 @@ progname=$0 ...@@ -80,14 +80,6 @@ progname=$0
# if PWD already has a value, it is probably wrong. # if PWD already has a value, it is probably wrong.
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
case "${progname}" in
/* | [[A-Za-z]]:[[\\/]]* ) ;;
*/*) ;;
*)
PATH=$PATH:${PWD=`${PWDCMD-pwd}`} ; export PATH
;;
esac
# Export original configure arguments for use by sub-configures. # Export original configure arguments for use by sub-configures.
TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@" TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@"
export TOPLEVEL_CONFIGURE_ARGUMENTS export TOPLEVEL_CONFIGURE_ARGUMENTS
...@@ -2008,15 +2000,15 @@ AC_SUBST(YACC) ...@@ -2008,15 +2000,15 @@ AC_SUBST(YACC)
AC_SUBST(config_shell) AC_SUBST(config_shell)
# Host tools. # Host tools.
AC_CHECK_TOOL(AR, ar) NCN_STRICT_CHECK_TOOL(AR, ar)
AC_CHECK_TOOL(AS, as) NCN_STRICT_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(DLLTOOL, dlltool) NCN_STRICT_CHECK_TOOL(DLLTOOL, dlltool)
AC_CHECK_TOOL(LD, ld) NCN_STRICT_CHECK_TOOL(LD, ld)
AC_CHECK_TOOL(NM, nm) NCN_STRICT_CHECK_TOOL(NM, nm)
AC_CHECK_TOOL(RANLIB, ranlib, :) NCN_STRICT_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(WINDRES, windres) NCN_STRICT_CHECK_TOOL(WINDRES, windres)
AC_CHECK_TOOL(OBJCOPY, objcopy) NCN_STRICT_CHECK_TOOL(OBJCOPY, objcopy)
AC_CHECK_TOOL(OBJDUMP, objdump) NCN_STRICT_CHECK_TOOL(OBJDUMP, objdump)
AC_SUBST(CC) AC_SUBST(CC)
AC_SUBST(CXX) AC_SUBST(CXX)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
...@@ -2026,13 +2018,13 @@ AC_SUBST(DEFAULT_LEX) ...@@ -2026,13 +2018,13 @@ AC_SUBST(DEFAULT_LEX)
AC_SUBST(DEFAULT_M4) AC_SUBST(DEFAULT_M4)
# Target tools. # Target tools.
NCN_CHECK_TARGET_TOOL(AR_FOR_TARGET, ar) NCN_STRICT_CHECK_TARGET_TOOL(AR_FOR_TARGET, ar)
NCN_CHECK_TARGET_TOOL(AS_FOR_TARGET, as) NCN_STRICT_CHECK_TARGET_TOOL(AS_FOR_TARGET, as)
NCN_CHECK_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool) NCN_STRICT_CHECK_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
NCN_CHECK_TARGET_TOOL(LD_FOR_TARGET, ld) NCN_STRICT_CHECK_TARGET_TOOL(LD_FOR_TARGET, ld)
NCN_CHECK_TARGET_TOOL(NM_FOR_TARGET, nm) NCN_STRICT_CHECK_TARGET_TOOL(NM_FOR_TARGET, nm)
NCN_CHECK_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :) NCN_STRICT_CHECK_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :)
NCN_CHECK_TARGET_TOOL(WINDRES_FOR_TARGET, windres) NCN_STRICT_CHECK_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
AC_SUBST(GCC_FOR_TARGET) AC_SUBST(GCC_FOR_TARGET)
AC_SUBST(FLAGS_FOR_TARGET) AC_SUBST(FLAGS_FOR_TARGET)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment