ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-07 11:20:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Switch CT_CC_{CORE_}SYSROOT_ARG to arrays

Browse Source 
CT_CC_{CORE_}SYSROOT_ARG is being used both as an array and string. Switch everything
to be used as an array for consistency.

Signed-off-by: Justin Chen <justinpopo6@gmail.com>
This commit is contained in:
Justin Chen 2022-06-28 16:36:06 -07:00 committed by Chris Packham
parent 00adecf62f
commit c97a785485
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/cc/gcc.sh
View File

@ -1227,7 +1227,7 @@ do_gcc_backend() {
--target=${CT_TARGET} \ --target=${CT_TARGET} \
--prefix="${prefix}" \ --prefix="${prefix}" \
--exec_prefix="${exec_prefix}" \ --exec_prefix="${exec_prefix}" \
${CT_CC_SYSROOT_ARG} \ "${CT_CC_SYSROOT_ARG[@]}" \
"${extra_config[@]}" \ "${extra_config[@]}" \
--with-local-prefix="${CT_SYSROOT_DIR}" \ --with-local-prefix="${CT_SYSROOT_DIR}" \
--enable-long-long \ --enable-long-long \

8
scripts/crosstool-NG.sh
View File

@ -345,8 +345,8 @@ if [ -z "${CT_RESTART}" ]; then
CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include" CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include"
CT_SanitizeVarDir CT_SYSROOT_DIR CT_DEBUGROOT_DIR CT_HEADERS_DIR CT_SanitizeVarDir CT_SYSROOT_DIR CT_DEBUGROOT_DIR CT_HEADERS_DIR
CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
CT_CC_CORE_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" CT_CC_CORE_SYSROOT_ARG=("--with-sysroot=${CT_SYSROOT_DIR}")
CT_CC_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" CT_CC_SYSROOT_ARG=("--with-sysroot=${CT_SYSROOT_DIR}")
# glibc's prefix must be exactly /usr, else --with-sysroot'd gcc will get # glibc's prefix must be exactly /usr, else --with-sysroot'd gcc will get
# confused when $sysroot/usr/include is not present. # confused when $sysroot/usr/include is not present.
# Note: --prefix=/usr is magic! # Note: --prefix=/usr is magic!
@ -363,8 +363,8 @@ if [ -z "${CT_RESTART}" ]; then
CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
# Use --with-headers, else final gcc will define disable_glibc while # Use --with-headers, else final gcc will define disable_glibc while
# building libgcc, and you'll have no profiling # building libgcc, and you'll have no profiling
CT_CC_CORE_SYSROOT_ARG="--without-headers" CT_CC_CORE_SYSROOT_ARG=("--without-headers")
CT_CC_SYSROOT_ARG="--with-headers=${CT_HEADERS_DIR}" CT_CC_SYSROOT_ARG=("--with-headers=${CT_HEADERS_DIR}")
fi fi
CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}" CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}"
CT_DoExecLog ALL mkdir -p "${CT_DEBUGROOT_DIR}" CT_DoExecLog ALL mkdir -p "${CT_DEBUGROOT_DIR}"