summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 19:19:25 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 19:19:25 +0000
commitced797bc2a72216d46b7c1fa9e15eb28bbeb7dff (patch)
treebfd7158544c1103d90eeff628351fafb9f4f0408 /native_client_sdk
parent97610e17068f32987701e27caf2308d44d101e75 (diff)
downloadchromium_src-ced797bc2a72216d46b7c1fa9e15eb28bbeb7dff.zip
chromium_src-ced797bc2a72216d46b7c1fa9e15eb28bbeb7dff.tar.gz
chromium_src-ced797bc2a72216d46b7c1fa9e15eb28bbeb7dff.tar.bz2
[NaCl SDK] Set PEPPER_DIR properly when building naclports.
This should be "pepper_NN", but was coming through as a path. BUG=none R=sbc@chromium.org Review URL: https://codereview.chromium.org/62753002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/build_sdk.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index cc6073c..73226b76 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -823,7 +823,7 @@ def BuildStepBuildNaClPorts(pepper_ver, pepperdir):
env = dict(os.environ)
env['NACL_SDK_ROOT'] = pepperdir
- env['PEPPER_DIR'] = os.path.dirname(pepperdir)
+ env['PEPPER_DIR'] = os.path.basename(pepperdir) # pepper_NN
env['NACLPORTS_NO_ANNOTATE'] = "1"
env['NACLPORTS_NO_UPLOAD'] = "1"