From f0b5c37abf28eebfdb6abc5773bec630e957fa48 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 2 Jan 2010 00:15:19 +0100 Subject: scripts/addtoolversion: prepare for hooks for tools others than gcc The upcoming git support will require hooks for glibc as well. diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 876d4e2..d071cef 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -95,19 +95,21 @@ addToolVersion() { [ -n "${exp_obs_prompt}" ] && SedExpr1="${SedExpr1}${exp_obs_prompt}" SedExpr1="${SedExpr1}\"" [ -n "${deps}" ] && SedExpr1="${SedExpr1}\n${deps}" - if [ "${tool}" = "gcc" ]; then - # Extract 'M'ajor and 'm'inor from version string - 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 3 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" - fi - if [ ${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" - fi - fi + case "${tool}" in + gcc) + # Extract 'M'ajor and 'm'inor from version string + 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 3 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" + fi + if [ ${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" + fi + ;; + esac SedExpr2=" default \"${version}\" if ${cat}_V_${v}" "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n\n'"${SedExpr1}"'/;' "${file}" "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_BELOW)$/\1\n'"${SedExpr2}"'/;' "${file}" -- cgit v0.10.2-6-g49f6