From 102f32212c2e08281d38f59a802377934318680e Mon Sep 17 00:00:00 2001
From: phosek <phosek@chromium.org>
Date: Mon, 16 Nov 2015 17:44:47 -0800
Subject: 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}
---
 build/config/nacl/rules.gni | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'build')

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"
     }
-- 
cgit v1.1