diff options
Diffstat (limited to 'meta/files')
-rw-r--r-- | meta/files/toolchain-shar-extract.sh | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 06934e5a9a..e2c617958a 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh | |||
@@ -31,9 +31,6 @@ tweakpath /sbin | |||
31 | INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") | 31 | INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") |
32 | SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") | 32 | SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") |
33 | 33 | ||
34 | INST_GCC_VER=$(gcc --version 2>/dev/null | sed -ne 's/.* \([0-9]\+\.[0-9]\+\)\.[0-9]\+.*/\1/p') | ||
35 | SDK_GCC_VER='@SDK_GCC_VER@' | ||
36 | |||
37 | verlte () { | 34 | verlte () { |
38 | [ "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ] | 35 | [ "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ] |
39 | } | 36 | } |
@@ -145,11 +142,6 @@ fi | |||
145 | # SDK_EXTENSIBLE is exposed from the SDK_PRE_INSTALL_COMMAND above | 142 | # SDK_EXTENSIBLE is exposed from the SDK_PRE_INSTALL_COMMAND above |
146 | if [ "$SDK_EXTENSIBLE" = "1" ]; then | 143 | if [ "$SDK_EXTENSIBLE" = "1" ]; then |
147 | DEFAULT_INSTALL_DIR="@SDKEXTPATH@" | 144 | DEFAULT_INSTALL_DIR="@SDKEXTPATH@" |
148 | if [ "$INST_GCC_VER" = '4.8' -a "$SDK_GCC_VER" = '4.9' ] || [ "$INST_GCC_VER" = '4.8' -a "$SDK_GCC_VER" = '' ] || \ | ||
149 | [ "$INST_GCC_VER" = '4.9' -a "$SDK_GCC_VER" = '' ]; then | ||
150 | echo "Error: Incompatible SDK installer! Your host gcc version is $INST_GCC_VER and this SDK was built by gcc higher version." | ||
151 | exit 1 | ||
152 | fi | ||
153 | fi | 145 | fi |
154 | 146 | ||
155 | if [ "$target_sdk_dir" = "" ]; then | 147 | if [ "$target_sdk_dir" = "" ]; then |