mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-21 05:43:09 +00:00
scripts: use CT_CONFIG_SHELL instead of CT_SHELL
CT_SHELL is undefined. Thus, the generated wrapper scripts are not executable by the kernel because they do not contain a valid interpreter. Use CT_CONFIG_SHELL instead. Signed-off-by: "Titus von Boxberg" <titus@v9g.de> (transplanted from cf509170838f4e289fe25617e3f3db1d6d6ffc41)
This commit is contained in:
parent
421c524532
commit
eabd25ae00
@ -80,7 +80,7 @@ cat "${CT_LIB_DIR}/paths.mk" |while read trash line; do
|
|||||||
tool="${line%%=*}"
|
tool="${line%%=*}"
|
||||||
path="${line#*=}"
|
path="${line#*=}"
|
||||||
CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}'"
|
CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}'"
|
||||||
printf "#${BANG}${CT_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
|
printf "#${BANG}${CT_CONFIG_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
|
||||||
CT_DoExecLog ALL chmod 700 "${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
|
CT_DoExecLog ALL chmod 700 "${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
|
||||||
done
|
done
|
||||||
export PATH="${CT_TOOLS_OVERIDE_DIR}/bin:${PATH}"
|
export PATH="${CT_TOOLS_OVERIDE_DIR}/bin:${PATH}"
|
||||||
@ -414,7 +414,7 @@ if [ -z "${CT_RESTART}" ]; then
|
|||||||
# bally needed
|
# bally needed
|
||||||
if [ -n "${where}" ]; then
|
if [ -n "${where}" ]; then
|
||||||
CT_DoLog DEBUG " '${!v}-${tool}' -> '${where}'"
|
CT_DoLog DEBUG " '${!v}-${tool}' -> '${where}'"
|
||||||
printf "#${BANG}${CT_SHELL}\nexec '${where}' \"\${@}\"\n" >"${CT_BUILDTOOLS_PREFIX_DIR}/bin/${!v}-${tool}"
|
printf "#${BANG}${CT_CONFIG_SHELL}\nexec '${where}' \"\${@}\"\n" >"${CT_BUILDTOOLS_PREFIX_DIR}/bin/${!v}-${tool}"
|
||||||
CT_DoExecLog ALL chmod 700 "${CT_BUILDTOOLS_PREFIX_DIR}/bin/${!v}-${tool}"
|
CT_DoExecLog ALL chmod 700 "${CT_BUILDTOOLS_PREFIX_DIR}/bin/${!v}-${tool}"
|
||||||
else
|
else
|
||||||
case "${tool}" in
|
case "${tool}" in
|
||||||
@ -448,7 +448,7 @@ if [ -z "${CT_RESTART}" ]; then
|
|||||||
# Go ahead with those, by creating a wrapper that keeps partial files, and that
|
# Go ahead with those, by creating a wrapper that keeps partial files, and that
|
||||||
# never fails:
|
# never fails:
|
||||||
CT_DoLog DEBUG " 'makeinfo' -> '$(CT_Which makeinfo)'"
|
CT_DoLog DEBUG " 'makeinfo' -> '$(CT_Which makeinfo)'"
|
||||||
printf "#${BANG}${CT_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_BUILDTOOLS_PREFIX_DIR}/bin/makeinfo"
|
printf "#${BANG}${CT_CONFIG_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_BUILDTOOLS_PREFIX_DIR}/bin/makeinfo"
|
||||||
CT_DoExecLog ALL chmod 700 "${CT_BUILDTOOLS_PREFIX_DIR}/bin/makeinfo"
|
CT_DoExecLog ALL chmod 700 "${CT_BUILDTOOLS_PREFIX_DIR}/bin/makeinfo"
|
||||||
|
|
||||||
# Carefully add paths in the order we want them:
|
# Carefully add paths in the order we want them:
|
||||||
|
Loading…
Reference in New Issue
Block a user