diff options
author | Alexey Neyman <stilor@att.net> | 2017-09-03 17:43:21 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-03 17:43:21 (GMT) |
commit | 95de709fe3f7e58af210c2727a7b28608936068e (patch) | |
tree | 349daeaf546a5c3c9e942967ba0512b67769d42d /scripts/build | |
parent | 98b6a5a4503095ba539a415d90e3f2c5331985ed (diff) | |
parent | b0f14b0dfa1b8a060ba75c5a7294241857f51b3c (diff) |
Merge pull request #822 from nathanchance/pkgversion-flexibility
Improve toolchain ID options
Diffstat (limited to 'scripts/build')
-rw-r--r-- | scripts/build/binutils/binutils.sh | 4 | ||||
-rw-r--r-- | scripts/build/cc/gcc.sh | 4 | ||||
-rw-r--r-- | scripts/build/debug/300-gdb.sh | 2 | ||||
-rw-r--r-- | scripts/build/libc/glibc.sh | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index e0fe7f4..703a6fa 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -154,7 +154,7 @@ do_binutils_backend() { extra_config+=( --enable-plugins ) fi if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then - extra_config+=("--with-pkgversion=${CT_PKGVERSION}") + [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") fi if [ "${CT_MULTILIB}" = "y" ]; then @@ -307,7 +307,7 @@ do_binutils_for_target() { CT_DoLog EXTRA "Configuring binutils for target" if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then - extra_config+=("--with-pkgversion=${CT_PKGVERSION}") + [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") fi if [ "${CT_MULTILIB}" = "y" ]; then diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 54dd514..2609873 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -357,7 +357,7 @@ do_gcc_core_backend() { fi done - extra_config+=("--with-pkgversion=${CT_PKGVERSION}") + [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then @@ -874,7 +874,7 @@ do_gcc_backend() { done [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared") - extra_config+=("--with-pkgversion=${CT_PKGVERSION}") + [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 19d9d6d..e3a40d0 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -19,7 +19,7 @@ do_debug_gdb_build() { esac if [ "${CT_GDB_HAS_PKGVERSION_BUGURL}" = "y" ]; then - extra_config+=("--with-pkgversion=${CT_PKGVERSION}") + [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") fi diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index c09ff5c..0cf58f3 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -168,7 +168,7 @@ do_libc_backend_once() { *) extra_config+=("--enable-add-ons=$(do_libc_add_ons_list ,)");; esac - extra_config+=("--with-pkgversion=${CT_PKGVERSION}") + [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") touch config.cache @@ -484,7 +484,7 @@ do_libc_locales() { # a harmless: `configure: WARNING: unrecognized options: --with-bugurl...` # If it's set, use it, if is a recognized option. if [ ! "${CT_TOOLCHAIN_PKGVERSION}" = "" ]; then - extra_config+=("--with-pkgversion=${CT_PKGVERSION}") + [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") fi if [ ! "${CT_TOOLCHAIN_BUGURL}" = "" ]; then [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") |