diff options
| author | Justin Chen <justinpopo6@gmail.com> | 2022-06-28 16:36:06 -0700 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2022-07-01 16:33:37 +1200 |
| commit | c97a7854856a3c62dab3b95b0b9d0dd6f0b7ea05 (patch) | |
| tree | 03b545e2de033db2a66c75add3c0c22e6c196622 /scripts | |
| parent | 00adecf62f45fdeb49ec17948abd3c162e687b4e (diff) | |
| download | crosstool-ng-c97a7854856a3c62dab3b95b0b9d0dd6f0b7ea05.tar.gz crosstool-ng-c97a7854856a3c62dab3b95b0b9d0dd6f0b7ea05.tar.bz2 crosstool-ng-c97a7854856a3c62dab3b95b0b9d0dd6f0b7ea05.zip | |
Switch CT_CC_{CORE_}SYSROOT_ARG to arrays
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/cc/gcc.sh | 2 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index eb7efd25..53824a27 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -1227,7 +1227,7 @@ do_gcc_backend() { --target=${CT_TARGET} \ --prefix="${prefix}" \ --exec_prefix="${exec_prefix}" \ - ${CT_CC_SYSROOT_ARG} \ + "${CT_CC_SYSROOT_ARG[@]}" \ "${extra_config[@]}" \ --with-local-prefix="${CT_SYSROOT_DIR}" \ --enable-long-long \ diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh index ea3bd686..f695613c 100644 --- a/scripts/crosstool-NG.sh +++ b/scripts/crosstool-NG.sh @@ -345,8 +345,8 @@ if [ -z "${CT_RESTART}" ]; then CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include" CT_SanitizeVarDir CT_SYSROOT_DIR CT_DEBUGROOT_DIR CT_HEADERS_DIR CT_BINUTILS_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_CORE_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 # confused when $sysroot/usr/include is not present. # Note: --prefix=/usr is magic! @@ -363,8 +363,8 @@ if [ -z "${CT_RESTART}" ]; then CT_BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" # Use --with-headers, else final gcc will define disable_glibc while # building libgcc, and you'll have no profiling - CT_CC_CORE_SYSROOT_ARG="--without-headers" - CT_CC_SYSROOT_ARG="--with-headers=${CT_HEADERS_DIR}" + CT_CC_CORE_SYSROOT_ARG=("--without-headers") + CT_CC_SYSROOT_ARG=("--with-headers=${CT_HEADERS_DIR}") fi CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}" CT_DoExecLog ALL mkdir -p "${CT_DEBUGROOT_DIR}" |