aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-21 00:40:16 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-21 00:40:16 +0000
commitfe424101036c75548967f952213d041eb7ffca83 (patch)
tree09364b249946bfca25523f3ba1cba3815ca53e5b /platform_tools
parentd832f1d5b5472528301bff3d3faf0741735f2825 (diff)
Fix NaCl build for pepper_32
BUG=skia: R=rmistry@google.com, djsollen@google.com Author: borenet@google.com Review URL: https://codereview.chromium.org/171233015 git-svn-id: http://skia.googlecode.com/svn/trunk@13523 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
-rwxr-xr-xplatform_tools/nacl/nacl_make5
1 files changed, 3 insertions, 2 deletions
diff --git a/platform_tools/nacl/nacl_make b/platform_tools/nacl/nacl_make
index 74b85718d6..97a1e9ed64 100755
--- a/platform_tools/nacl/nacl_make
+++ b/platform_tools/nacl/nacl_make
@@ -64,8 +64,9 @@ function setenv {
exportVar AR "${NACLAR}"
exportVar RANLIB "${NACLRANLIB}"
exportVar PATH ${NACL_BIN_PATH}:${PATH};
-
- exportVar GYP_DEFINES "skia_os=nacl skia_arch_width=${ARCH_WIDTH}"
+ 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}"
}
function build {