aboutsummaryrefslogtreecommitdiff
path: root/scripts/build/cc
diff options
context:
space:
mode:
authorBenoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>2011-05-31 20:12:35 +0200
committerBenoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>2011-05-31 20:12:35 +0200
commit35fe8a047d4a0d14c74708434e2e4ba2d845681d (patch)
treec13433c1987ea10104b9df95f18000205c41da7f /scripts/build/cc
parentb87fff5473c6314b10d44677ec109446124119b8 (diff)
downloadcrosstool-ng-35fe8a047d4a0d14c74708434e2e4ba2d845681d.tar.gz
crosstool-ng-35fe8a047d4a0d14c74708434e2e4ba2d845681d.tar.bz2
crosstool-ng-35fe8a047d4a0d14c74708434e2e4ba2d845681d.zip
gcc: promote PKGVERSION and BUGURL options to toolchain level
This patch promotes the PKGVERSION and BUGURL options to toolchain level so that all toolchain components supporting them can benefit from them. These options are passed to configure through --with-pkgversion and --with-bugurl. They are supported by binutils 2.18+, gcc 4.3+, eglibc 2.9+ and gdb 7.0+. Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'scripts/build/cc')
-rw-r--r--scripts/build/cc/gcc.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index a3907710..e191bb6f 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) ;;