set skia_arch_type in nacl_make

platform_tools/nacl/nacl_make

 #!/bin/bash
 
 function exportVar {
   NAME=$1
   VALUE=$2
   echo export $NAME=\"$VALUE\"
   export $NAME="$VALUE"
 }
 
 function setenv {
   if [ -z "$1" ]; then
     echo "ERROR: setenv() requires one argument."
     exit 1
   fi
   if [ -z "${NACL_SDK_ROOT}" ]; then
     echo "ERROR: This script requires NACL_SDK_ROOT to be set."
     exit 1
   fi
 
   ARCH_WIDTH=$1
   if [ ${ARCH_WIDTH} = "32" ]; then
+    ARCH_TYPE=x86
     CROSS_ID=i686
   elif [ ${ARCH_WIDTH} = "64" ]; then
+    ARCH_TYPE=x86_64
     CROSS_ID=x86_64
   else
     echo "ERROR: Unknown arch width: ${ARCH_WIDTH}"
     exit 1
   fi
 
   OS_NAME=$(uname -s)
   if [ $OS_NAME = "Darwin" ]; then
     OS_SUBDIR="mac"
     OS_SUBDIR_SHORT="mac"
@@ skipping 25 matching lines @@
   exportVar NACLSTRINGS ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strings
   exportVar NACLSTRIP ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strip
 
   exportVar CC "${NACLCC}"
   exportVar CXX "${NACLCXX}"
   exportVar AR "${NACLAR}"
   exportVar RANLIB "${NACLRANLIB}"
   exportVar PATH ${NACL_BIN_PATH}:${PATH};
   exportVar C_INCLUDE_PATH "${NACL_SDK_ROOT}/include:${NACL_SDK_ROOT}/ports/include:${C_INCLUDE_PATH}"
   exportVar CPLUS_INCLUDE_PATH "${NACL_SDK_ROOT}/include:${NACL_SDK_ROOT}/ports/include:${CPLUS_INCLUDE_PATH}"
-  exportVar GYP_DEFINES "skia_os=nacl skia_gpu=0 skia_arch_width=${ARCH_WIDTH}"
+  exportVar GYP_DEFINES \
+      "skia_os=nacl skia_gpu=0 skia_arch_width=${ARCH_WIDTH} skia_arch_type=${ARCH_TYPE}"
 }
 
 function build {
   if [ -z "$1" ]; then
     echo "ERROR: build() requires one argument."
     exit 1
   fi
   setenv $1
 
   export SKIA_OUT=out/nacl$1
@@ skipping 22 matching lines @@
   if [[ "$?" != "0" ]]; then
     echo "Unable to find ccache!"
     exit 1
   fi
 fi
 
 build 32 && \
 build 64 && \
 if ! [ -L platform_tools/nacl/out ]; then
   ln -s ../../out platform_tools/nacl
-fi
+fi