summaryrefslogtreecommitdiff
path: root/scripts/crosstool-NG.sh.in
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2016-12-14 09:06:10 (GMT)
committerAlexey Neyman <stilor@att.net>2016-12-19 19:45:24 (GMT)
commit5c985041fd7b71d6f9ae0141d8759c0eff1ea1eb (patch)
tree631a847c1b81baf986437d0e2309a48c8d935b26 /scripts/crosstool-NG.sh.in
parentcccb8d84817bca1cf1d33cfdb5932f361437c229 (diff)
Kill CT_INSTALL_DIR.
We now use CT_PREFIX and expect the resulting toolchain to be relocatable. Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/crosstool-NG.sh.in')
-rw-r--r--scripts/crosstool-NG.sh.in19
1 files changed, 9 insertions, 10 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 063162d..bbefb1f 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -206,7 +206,7 @@ case "${CT_TOOLCHAIN_TYPE}" in
esac
# Compute test suite install directory
-CT_TEST_SUITE_DIR=${CT_INSTALL_DIR}/test-suite
+CT_TEST_SUITE_DIR=${CT_PREFIX_DIR}/test-suite
# We must ensure that we can restart if asked for!
if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}" ]; then
@@ -226,8 +226,8 @@ if [ "${CT_SAVE_TARBALLS}" = "y" \
fi
# Check now if we can write to the destination directory:
-if [ -d "${CT_INSTALL_DIR}" ]; then
- CT_TestAndAbort "Destination directory '${CT_INSTALL_DIR}' is not removable" ! -w $(dirname "${CT_INSTALL_DIR}")
+if [ -d "${CT_PREFIX_DIR}" ]; then
+ CT_TestAndAbort "Destination directory '${CT_PREFIX_DIR}' is not removable" ! -w $(dirname "${CT_PREFIX_DIR}")
fi
# Good, now grab a bit of informations on the system we're being run on,
@@ -260,8 +260,8 @@ if [ -z "${CT_RESTART}" ]; then
if [ "${CT_FORCE_EXTRACT}" = "y" -a -d "${CT_SRC_DIR}" ]; then
CT_DoForceRmdir "${CT_SRC_DIR}"
fi
- if [ -d "${CT_INSTALL_DIR}" -a "${CT_RM_RF_PREFIX_DIR}" = "y" ]; then
- CT_DoForceRmdir "${CT_INSTALL_DIR}"
+ if [ -d "${CT_PREFIX_DIR}" -a "${CT_RM_RF_PREFIX_DIR}" = "y" ]; then
+ CT_DoForceRmdir "${CT_PREFIX_DIR}"
fi
# In case we start anew, get rid of the previously saved state directory
if [ -d "${CT_STATE_DIR}" ]; then
@@ -276,7 +276,6 @@ CT_DoExecLog ALL mkdir -p "${CT_TARBALLS_DIR}"
CT_DoExecLog ALL mkdir -p "${CT_SRC_DIR}"
CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}"
CT_DoExecLog ALL mkdir -p "${CT_BUILDTOOLS_PREFIX_DIR}/bin"
-CT_DoExecLog ALL mkdir -p "${CT_INSTALL_DIR}"
CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}"
CT_DoExecLog ALL mkdir -p "${CT_HOST_COMPLIBS_DIR}"
@@ -288,9 +287,9 @@ CT_DoExecLog DEBUG touch "${CT_PREFIX_DIR}/foo"
CT_TestAndAbort "Your file system in '${CT_PREFIX_DIR}' is *not* case-sensitive!" -f "${CT_PREFIX_DIR}/FOO"
CT_DoExecLog DEBUG rm -f "${CT_PREFIX_DIR}/foo"
-# Kludge: CT_INSTALL_DIR and CT_PREFIX_DIR might have grown read-only if
+# Kludge: CT_PREFIX_DIR might have grown read-only if
# the previous build was successful.
-CT_DoExecLog ALL chmod -R u+w "${CT_INSTALL_DIR}" "${CT_PREFIX_DIR}"
+CT_DoExecLog ALL chmod -R u+w "${CT_PREFIX_DIR}"
# Setting up the rest of the environment only if not restarting
if [ -z "${CT_RESTART}" ]; then
@@ -664,8 +663,8 @@ if [ "${CT_LOG_TO_FILE}" = "y" ]; then
bzip2 -9 "${CT_PREFIX_DIR}/build.log"
fi
fi
-if [ "${CT_INSTALL_DIR_RO}" = "y" ]; then
- chmod -R a-w "${CT_INSTALL_DIR}"
+if [ "${CT_PREFIX_DIR_RO}" = "y" ]; then
+ chmod -R a-w "${CT_PREFIX_DIR}"
fi
# CT_TEST_SUITE_DIR may not exist if only downloading or extracting
if [ "${CT_TEST_SUITE}" = "y" -a -d "${CT_TEST_SUITE_DIR}" ]; then