# HG changeset patch # User "Yann E. MORIN" # Date 1304845338 -7200 # Node ID 4cd9cda2265c0c76df3d4ff77a2f3461aae3bc9f # Parent 79947df7ec4b482297ba90c3fe77314336d200e5 scripts/addToolVersion: fix gcc complibs dependency Since the gcc configuration changes, the way to select the dependent companion libraries has changed. Update the addToolVersion script to match. Reported-by: Xun Li Signed-off-by: "Yann E. MORIN" diff -r 79947df7ec4b -r 4cd9cda2265c scripts/addToolVersion.sh --- a/scripts/addToolVersion.sh Sun May 08 10:52:21 2011 +0200 +++ b/scripts/addToolVersion.sh Sun May 08 11:02:18 2011 +0200 @@ -102,15 +102,16 @@ # 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 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 - SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" + if [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 6 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_6" + elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 5 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_5" + elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 4 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_4" + elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 3 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_3" + elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 2 \) ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_4_2" fi ;; uClibc)