diff options
| -rw-r--r-- | config/cc/gcc.in.2 | 20 | ||||
| -rw-r--r-- | config/toolchain.in | 18 | ||||
| -rw-r--r-- | scripts/build/cc/gcc.sh | 16 |
3 files changed, 28 insertions, 26 deletions
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index 770763d..bf33373 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -1,25 +1,5 @@ # gcc configuration options -config CC_PKGVERSION - string - prompt "gcc ID string" - depends on CC_GCC_HAS_PKGVERSION_BUGURL - default "crosstool-NG-${CT_VERSION}" - help - Specify a string that identifies your package. You may wish to include - a build number or build date. This version string will be included in - the output of gcc --version. - - This is passed to the configure flag --with-pkgversion. - -config CC_BUGURL - string - prompt "gcc bug URL" - depends on CC_GCC_HAS_PKGVERSION_BUGURL - default "" - help - Specify the URL that users should visit if they wish to report a bug. - config CC_ENABLE_CXX_FLAGS string prompt "Flags to pass to --enable-cxx-flags" diff --git a/config/toolchain.in b/config/toolchain.in index 072cf1b..4fdea14 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -66,6 +66,24 @@ config STATIC_TOOLCHAIN NOTE: this has no connection to whether the target libraries will be dynamic or static. This only applies to the tools themselves. +config TOOLCHAIN_PKGVERSION + string + prompt "Toolchain ID string" + default "crosstool-NG-${CT_VERSION}" + help + Specify a string that identifies your package. You may wish to include + a build number or build date. This version string will be included in + the output of gcc --version. + + This is passed to the configure flag --with-pkgversion. + +config TOOLCHAIN_BUGURL + string + prompt "Toolchain bug URL" + default "" + help + Specify the URL that users should visit if they wish to report a bug. + comment "Tuple completion and aliasing" config TARGET_VENDOR diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index a390771..e191bb6 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -159,9 +159,11 @@ do_cc_core() { mkdir -p "${CT_BUILD_DIR}/build-cc-core-${mode}" cd "${CT_BUILD_DIR}/build-cc-core-${mode}" - # Bare metal delivers the core compiler as final compiler, so add version info and bugurl - [ -n "${CT_CC_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_CC_BUGURL}") - [ -n "${CT_CC_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_CC_PKGVERSION}") + if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then + # Bare metal delivers the core compiler as final compiler, so add version info and bugurl + [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}") + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") + fi if [ "${copy_headers}" = "y" ]; then CT_DoLog DEBUG "Copying headers to install area of bootstrap gcc, so it can build libgcc2" @@ -401,9 +403,11 @@ do_cc() { fi done - [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared") - [ -n "${CT_CC_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_CC_PKGVERSION}") - [ -n "${CT_CC_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_CC_BUGURL}") + [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared") + if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then + [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}") + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") + fi case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in y) extra_config+=("--enable-sjlj-exceptions");; m) ;; |