diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/build/libc/glibc-eglibc.sh-common | 2 | ||||
-rw-r--r-- | scripts/crosstool-NG.sh.in | 15 | ||||
-rw-r--r-- | scripts/populate.in | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index ad5024c..9919015 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -276,7 +276,7 @@ do_libc_min_kernel_config() { # We can't rely on the kernel version from the configuration, # because it might not be available if the user uses pre-installed # headers. On the other hand, both method will have the kernel - # version installed in "usr/include/linux/version.h" in the sys-root. + # version installed in "usr/include/linux/version.h" in the sysroot. # Parse that instead of having two code-paths. version_code_file="${CT_SYSROOT_DIR}/usr/include/linux/version.h" if [ ! -f "${version_code_file}" -o ! -r "${version_code_file}" ]; then diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index df5048d..d7dba89 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -283,9 +283,16 @@ esac # Setting up the rest of the environment only if not restarting if [ -z "${CT_RESTART}" ]; then - # Arrange paths depending on wether we use sys-root or not. + case "${CT_SYSROOT_NAME}" in + "") CT_SYSROOT_NAME="sysroot";; + .) CT_Abort "Sysroot name is set to '.' which is forbidden";; + *' '*) CT_Abort "Sysroot name contains forbidden space(s): '${CT_SYSROOT_NAME}'";; + */*) CT_Abort "Sysroot name contains forbidden slash(es): '${CT_SYSROOT_NAME}'";; + esac + + # Arrange paths depending on wether we use sysroot or not. if [ "${CT_USE_SYSROOT}" = "y" ]; then - CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sys-root" + CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}" CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root" CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include" BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" @@ -325,8 +332,8 @@ if [ -z "${CT_RESTART}" ]; then CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}/usr/include" if [ "${CT_USE_SYSROOT}" = "y" ]; then - # Prevent gcc from installing its libraries outside of the sys-root - CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib" + # Prevent gcc from installing its libraries outside of the sysroot + CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib" fi # Since we're *not* multilib on the target side, we want all the diff --git a/scripts/populate.in b/scripts/populate.in index 9b69afd..02b1797 100644 --- a/scripts/populate.in +++ b/scripts/populate.in @@ -57,9 +57,9 @@ OPTIONS -l name1[:name2[...]] Always add the specified shared library/ies name1, name2... from the - toolchain (in the sys-root). Actual library names are searched as + toolchain (in the sysroot). Actual library names are searched as follows (where 'name' is replaced with the given name) in the - sys-root directory: + sysroot directory: - libname.so - name.so - name |