From 64cd8928d9883fc76b93dcc2147ce16a51559194 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 22 Jan 2011 23:20:18 +0100
Subject: 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" <yann.morin.1998@anciens.enib.fr>
(transplanted from 2ed26c6465689c024044f79c19ba302f749d0100)

diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 9273e4c..14477c0 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -472,6 +472,13 @@ if [ -z "${CT_RESTART}" ]; then
         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 @@ if [ -z "${CT_RESTART}" ]; then
         *)  ;;
     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"
-- 
cgit v0.10.2-6-g49f6