diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-04-15 20:35:18 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-04-15 20:35:18 (GMT) |
| commit | 3c160b2205ec2857032bed04dd1ce89c053da395 (patch) | |
| tree | 16024ac074093875e277b3275bcda5e4bc69343f /scripts | |
| parent | c9b45d8751c2c092ca97fb7db0a0f1bfa209c24f (diff) | |
cc/gcc: add support for 4.5.0 or later versions
starting with 4.5.0, gcc requires libelf.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 5 | ||||
| -rw-r--r-- | scripts/build/cc/gcc.sh | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 42de00f..0258cdf 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -100,7 +100,10 @@ addToolVersion() { ver_M=$(echo "${version}...." |cut -d . -f 1) ver_m=$(echo "${version}...." |cut -d . -f 2) if [ ${ver_M} -gt 4 \ - -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then + -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 5 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_5_or_later" + elif [ ${ver_M} -gt 4 \ + -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then SedExpr1="${SedExpr1}\n select CC_GCC_4_4_or_later" elif [ ${ver_M} -gt 4 \ -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index ed80463..3234e47 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -171,6 +171,9 @@ do_cc_core() { extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}") extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}") fi + if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then + extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}") + fi CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" @@ -333,6 +336,9 @@ do_cc() { extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}") extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}") fi + if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then + extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}") + fi if [ "${CT_THREADS}" = "none" ]; then extra_config+=("--disable-threads") |