diff options
| author |  mtklein <mtklein@chromium.org> | 2015-02-12 11:34:09 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-12 11:34:09 -0800 |
| commit | 8bce2449e7d332d954523f6a55995ab9e3297ce1 (patch) | |
| tree | 6f7bb95d408296c6ff0020038d3e8ef56a2f3707 /platform_tools | |
| parent | df1c3373fc198f465cb0077516993dd41f268416 (diff) | |
set skia_arch_type in nacl_make
BUG=skia:
Review URL: https://codereview.chromium.org/914413003
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/nacl/nacl_make | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform_tools/nacl/nacl_make b/platform_tools/nacl/nacl_make index 97a1e9ed64..0109a2c328 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
\ No newline at end of file +fi |