diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-08 11:02:18 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-08 11:02:18 +0200 |
| commit | bf2f0d57d24fdf082232f5b5b0e3a456fa187aad (patch) | |
| tree | 361d78cc115fcc96eaad871af842ae0cf43fcd15 | |
| parent | 1ac7419d2e38758752f9066835183db56c5fab6e (diff) | |
| download | crosstool-ng-bf2f0d57d24fdf082232f5b5b0e3a456fa187aad.tar.gz crosstool-ng-bf2f0d57d24fdf082232f5b5b0e3a456fa187aad.tar.bz2 crosstool-ng-bf2f0d57d24fdf082232f5b5b0e3a456fa187aad.zip | |
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)
| -rwxr-xr-x | scripts/addToolVersion.sh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 5209f6bf..ffea750c 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -102,15 +102,16 @@ addToolVersion() { # 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) |