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 <lxfind@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 4cd9cda2265c0c76df3d4ff77a2f3461aae3bc9f)
This commit is contained in:
Yann E. MORIN" 2011-05-08 11:02:18 +02:00
parent 1ac7419d2e
commit bf2f0d57d2

View File

@ -102,15 +102,16 @@ addToolVersion() {
# Extract 'M'ajor and 'm'inor from version string # Extract 'M'ajor and 'm'inor from version string
ver_M=$(echo "${version}...." |cut -d . -f 1) ver_M=$(echo "${version}...." |cut -d . -f 1)
ver_m=$(echo "${version}...." |cut -d . -f 2) ver_m=$(echo "${version}...." |cut -d . -f 2)
if [ ${ver_M} -gt 4 \ if [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 6 \) ]; then
-o \( ${ver_M} -eq 4 -a ${ver_m} -ge 5 \) ]; then SedExpr1="${SedExpr1}\n select CC_GCC_4_6"
SedExpr1="${SedExpr1}\n select CC_GCC_4_5_or_later" elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 5 \) ]; then
elif [ ${ver_M} -gt 4 \ SedExpr1="${SedExpr1}\n select CC_GCC_4_5"
-o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 4 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_4_or_later" SedExpr1="${SedExpr1}\n select CC_GCC_4_4"
elif [ ${ver_M} -gt 4 \ elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 3 \) ]; then
-o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then SedExpr1="${SedExpr1}\n select CC_GCC_4_3"
SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 2 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_2"
fi fi
;; ;;
uClibc) uClibc)