summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_base.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/populate_sdk_base.bbclass')
-rw-r--r--meta/classes/populate_sdk_base.bbclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index da846b40ca..c587af8fdb 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -122,11 +122,14 @@ fakeroot create_shar() {
122#!/bin/bash 122#!/bin/bash
123 123
124INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") 124INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
125SDK_ARCH=$(echo ${SDK_ARCH} | sed -e "s/i[5-6]86/ix86/") 125SDK_ARCH=$(echo ${SDK_ARCH} | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
126 126
127if [ "$INST_ARCH" != "$SDK_ARCH" ]; then 127if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
128 echo "Error: Installation machine not supported!" 128 # Allow for installation of ix86 SDK on x86_64 host
129 exit 1 129 if [ "$INST_ARCH" != x86_64 -o "$SDK_ARCH" != ix86 ]; then
130 echo "Error: Installation machine not supported!"
131 exit 1
132 fi
130fi 133fi
131 134
132DEFAULT_INSTALL_DIR="${SDKPATH}" 135DEFAULT_INSTALL_DIR="${SDKPATH}"