diff options
| author | phosek <phosek@chromium.org> | 2015-11-16 17:44:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-17 01:46:21 +0000 |
| commit | 102f32212c2e08281d38f59a802377934318680e (patch) | |
| tree | e0d176a13ec75d8c3b9e35e97600346c06657533 /build | |
| parent | 85e6acce401217600b7397561e6f8a3b4bea921f (diff) | |
| download | chromium_src-102f32212c2e08281d38f59a802377934318680e.zip chromium_src-102f32212c2e08281d38f59a802377934318680e.tar.gz chromium_src-102f32212c2e08281d38f59a802377934318680e.tar.bz2 | |
GN: Use NaCl's newlib objdump for PNaCl
PNaCl doesn't provide objdump, so use NaCl newlib version when
generating nmf files for PNaCl since the create_nmf.py script requires
objdump to be set.
BUG=462791
Review URL: https://codereview.chromium.org/1449223002
Cr-Commit-Position: refs/heads/master@{#359970}
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/nacl/rules.gni | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni index adecc30..c298aab 100644 --- a/build/config/nacl/rules.gni +++ b/build/config/nacl/rules.gni @@ -36,7 +36,14 @@ template("generate_nmf") { "testonly", ]) - objdump = rebase_path("${nacl_toolprefix}objdump") + # TODO(phosek): Remove this conditional once + # https://bugs.chromium.org/p/nativeclient/issues/detail?id=4339 is + # resolved. + if (current_cpu == "pnacl") { + objdump = rebase_path("${nacl_toolchain_bindir}/x86_64-nacl-objdump") + } else { + objdump = rebase_path("${nacl_toolprefix}objdump") + } if (host_os == "win") { objdump += ".exe" } |