Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: platform_tools/nacl/nacl_make

Issue 914413003: set skia_arch_type in nacl_make (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/nacl/nacl_make
diff --git a/platform_tools/nacl/nacl_make b/platform_tools/nacl/nacl_make
index 97a1e9ed641dd41a098d00182db7b28b3c4e166d..0109a2c328a8a95a6de2e06e069f0b92a8255810 100755
--- a/platform_tools/nacl/nacl_make
+++ b/platform_tools/nacl/nacl_make
@@ -19,8 +19,10 @@ function setenv {
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}"
@@ -66,7 +68,8 @@ function setenv {
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 {
@@ -109,4 +112,4 @@ build 32 && \
build 64 && \
if ! [ -L platform_tools/nacl/out ]; then
ln -s ../../out platform_tools/nacl
-fi
+fi
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698