diff options
| author | sbc <sbc@chromium.org> | 2015-01-30 11:11:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-30 19:13:57 +0000 |
| commit | 088561ac99314a79866a39f79bb32bd5e1196217 (patch) | |
| tree | 49b69e8487346cdd5393ed30b996b04c2b8a3d72 /ppapi/ppapi_nacl.gyp | |
| parent | de870139c90af7fc5957d42c8c2b0fbb09f95591 (diff) | |
| download | chromium_src-088561ac99314a79866a39f79bb32bd5e1196217.zip chromium_src-088561ac99314a79866a39f79bb32bd5e1196217.tar.gz chromium_src-088561ac99314a79866a39f79bb32bd5e1196217.tar.bz2 | |
[NaCl SDK] Remove create_nmf dependency on NACL_SDK_ROOT env var
create_nmf should determine the root of the SDK relative
to its own location.
The exception to this is when its run as part of the
chrome build, when it is not yet installed. In this
case we pass --no-default-libpath and --objdump to
create_nmf to remove any use of the SDK root.
Review URL: https://codereview.chromium.org/737653003
Cr-Commit-Position: refs/heads/master@{#313957}
Diffstat (limited to 'ppapi/ppapi_nacl.gyp')
| -rw-r--r-- | ppapi/ppapi_nacl.gyp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp index bbad955..aab96ef 100644 --- a/ppapi/ppapi_nacl.gyp +++ b/ppapi/ppapi_nacl.gyp @@ -139,6 +139,10 @@ '--strip-all', ], 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', + 'create_nmf_flags': [ + '--no-default-libpath', + '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', + ], 'create_nonsfi_test_nmf': 'tests/create_nonsfi_test_nmf.py', }, 'conditions': [ @@ -149,7 +153,6 @@ # doesn't work on Windows. 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', - 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', 'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf', }, 'actions': [ @@ -165,7 +168,7 @@ 'action': [ 'python', '>@(_inputs)', - '--objdump=>(nacl_objdump)', + '>@(create_nmf_flags)', '--output=>(nmf_glibc)', '--stage-dependencies=<(PRODUCT_DIR)', ], @@ -218,6 +221,7 @@ 'action': [ 'python', '>@(_inputs)', + '>@(create_nmf_flags)', '--output=>(nmf_pnacl)', ], 'conditions': [ @@ -306,6 +310,7 @@ 'action': [ 'python', '>@(_inputs)', + '>@(create_nmf_flags)', '--output=>(nmf_pnacl)', ], }, @@ -329,6 +334,7 @@ 'action': [ 'python', '>@(_inputs)', + '>@(create_nmf_flags)', '--output=>(nmf_pnacl)', ], }, |