1.1 --- a/scripts/build/cc/gcc.sh Tue May 24 14:15:47 2011 +0200
1.2 +++ b/scripts/build/cc/gcc.sh Tue May 31 20:39:42 2011 +0200
1.3 @@ -159,9 +159,11 @@
1.4 mkdir -p "${CT_BUILD_DIR}/build-cc-core-${mode}"
1.5 cd "${CT_BUILD_DIR}/build-cc-core-${mode}"
1.6
1.7 - # Bare metal delivers the core compiler as final compiler, so add version info and bugurl
1.8 - [ -n "${CT_CC_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_CC_BUGURL}")
1.9 - [ -n "${CT_CC_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_CC_PKGVERSION}")
1.10 + if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
1.11 + # Bare metal delivers the core compiler as final compiler, so add version info and bugurl
1.12 + [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
1.13 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
1.14 + fi
1.15
1.16 if [ "${copy_headers}" = "y" ]; then
1.17 CT_DoLog DEBUG "Copying headers to install area of bootstrap gcc, so it can build libgcc2"
1.18 @@ -401,9 +403,11 @@
1.19 fi
1.20 done
1.21
1.22 - [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared")
1.23 - [ -n "${CT_CC_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_CC_PKGVERSION}")
1.24 - [ -n "${CT_CC_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_CC_BUGURL}")
1.25 + [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared")
1.26 + if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
1.27 + [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
1.28 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
1.29 + fi
1.30 case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in
1.31 y) extra_config+=("--enable-sjlj-exceptions");;
1.32 m) ;;