# HG changeset patch # User "Yann E. MORIN" # Date 1295734818 -3600 # Node ID 2ed26c6465689c024044f79c19ba302f749d0100 # Parent ee3185cdaf1b3a889ac8e46bf48dfa726aab337b scripts: create the makeinfo wrapper before we set PATH If we set PATH to the tools wrappers before we create the makeinfo wrapper, then we may well wrap an existing wrapper from a previous run. Signed-off-by: "Yann E. MORIN" diff -r ee3185cdaf1b -r 2ed26c646568 scripts/crosstool-NG.sh.in --- a/scripts/crosstool-NG.sh.in Sat Jan 22 22:52:57 2011 +0100 +++ b/scripts/crosstool-NG.sh.in Sat Jan 22 23:20:18 2011 +0100 @@ -472,6 +472,13 @@ done done + # Some makeinfo versions are a pain in [put your most sensible body part here]. + # Go ahead with those, by creating a wrapper that keeps partial files, and that + # never fails: + CT_DoLog DEBUG " 'makeinfo' -> '$(CT_Which makeinfo)'" + printf "#${BANG}${CT_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_PREFIX_DIR}/buildtools/makeinfo" + CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/buildtools/makeinfo" + # Carefully add paths in the order we want them: # - first try in ${CT_PREFIX_DIR}/bin # - then try in ${CT_CC_CORE_SHARED_PREFIX_DIR}/bin @@ -485,13 +492,6 @@ *) ;; esac - # Some makeinfo versions are a pain in [put your most sensible body part here]. - # Go ahead with those, by creating a wrapper that keeps partial files, and that - # never fails: - CT_DoLog DEBUG " 'makeinfo' -> '$(CT_Which makeinfo)'" - printf "#${BANG}${CT_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_PREFIX_DIR}/buildtools/makeinfo" - CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/buildtools/makeinfo" - # Help gcc CT_CFLAGS_FOR_HOST= [ "${CT_USE_PIPES}" = "y" ] && CT_CFLAGS_FOR_HOST="${CT_CFLAGS_FOR_HOST} -pipe"