Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / pnacl / scripts / common-tools.sh

diff --git a/src/native_client/pnacl/scripts/common-tools.sh b/src/native_client/pnacl/scripts/common-tools.sh
index a60b8c3..317322a 100755 (executable)
--- a/src/native_client/pnacl/scripts/common-tools.sh
+++ b/src/native_client/pnacl/scripts/common-tools.sh
@@ -77,6 +77,7 @@ readonly SCONS_BUILD_PLATFORM
 readonly SO_EXT
 readonly SO_DIR
 
+BUILD_ARCH_SHORT=${BUILD_ARCH}
 BUILD_ARCH_X8632=false
 BUILD_ARCH_X8664=false
 BUILD_ARCH_ARM=false
@@ -86,18 +87,23 @@ if [ "${BUILD_ARCH}" == "x86_32" ] ||
    [ "${BUILD_ARCH}" == "i686" ] ; then
   BUILD_ARCH=x86_32
   BUILD_ARCH_X8632=true
+  BUILD_ARCH_SHORT=x86
 elif [ "${BUILD_ARCH}" == "x86_64" ] ; then
   BUILD_ARCH_X8664=true
+  BUILD_ARCH_SHORT=x86
 elif [ "${BUILD_ARCH}" == "armv7l" ] ; then
   BUILD_ARCH_ARM=true
+  BUILD_ARCH_SHORT=arm
 elif [ "${BUILD_ARCH}" == "mips32" ] ||
      [ "${BUILD_ARCH}" == "mips" ] ; then
   BUILD_ARCH_MIPS=true
+  BUILD_ARCH_SHORT=mips
 else
   echo "Unknown build arch '${BUILD_ARCH}'"
   exit -1
 fi
 readonly BUILD_ARCH
+readonly BUILD_ARCH_SHORT
 readonly BUILD_ARCH_X8632
 readonly BUILD_ARCH_X8664
 readonly BUILD_ARCH_ARM
@@ -489,23 +495,6 @@ Fatal() {
   exit -1
 }
 
-PackageCheck() {
-  assert-bin "makeinfo" "makeinfo not found. Please install 'texinfo' package."
-  assert-bin "bison"    "bison not found. Please install 'bison' package."
-  assert-bin "flex"     "flex not found. Please install 'flex' package."
-  assert-bin "gclient"  "gclient not found in PATH. Please install depot_tools."
-}
-
-assert-bin() {
-  local exe="$1"
-  local msg="$2"
-
-  if ! which "$exe" > /dev/null; then
-    Banner "ERROR: $msg"
-    exit -1
-  fi
-}
-
 is-ELF() {
   local F=$(file -b "$1")
   [[ "${F}" =~ "ELF" ]]