summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuhammad Shakeel <muhammad_shakeel@mentor.com>2012-12-04 15:40:59 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:13 +0000
commitef05a7fe17690e0f1557071f230593a66148d7dd (patch)
tree94c985bac4dfe60a2c05f41d55297fff7458dde2
parentbec5c30e1cae7363f71eecf54f14d53489a2d567 (diff)
downloadpoky-ef05a7fe17690e0f1557071f230593a66148d7dd.tar.gz
qa.py: Toolchain path should not be hardcoded to execute objdump
Currently objdump command is invoked from the STAGING_BINDIR_TOOLCHAIN directory. In case of external toolchain if this directory doesn't exist then objdump fails to execute. Instead of hardcoding the path it should search PATH to find it. (From OE-Core rev: a3a0e29d5d796fdf6755503cc31e45199b79d756) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/qa.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index 2c51141515..d9848c8e4a 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -97,14 +97,14 @@ class ELFFile:
97 return self.objdump_output[cmd] 97 return self.objdump_output[cmd]
98 98
99 objdump = d.getVar('OBJDUMP', True) 99 objdump = d.getVar('OBJDUMP', True)
100 staging_dir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
101 100
102 env = os.environ.copy() 101 env = os.environ.copy()
103 env["LC_ALL"] = "C" 102 env["LC_ALL"] = "C"
103 env["PATH"] = d.getVar('PATH', True)
104 104
105 try: 105 try:
106 bb.note("%s %s %s" % (objdump, cmd, self.name)) 106 bb.note("%s %s %s" % (objdump, cmd, self.name))
107 self.objdump_output[cmd] = bb.process.run([ os.path.join(staging_dir, objdump), cmd, self.name ], env=env, shell=False)[0] 107 self.objdump_output[cmd] = bb.process.run([objdump, cmd, self.name], env=env, shell=False)[0]
108 return self.objdump_output[cmd] 108 return self.objdump_output[cmd]
109 except Exception, e: 109 except Exception, e:
110 bb.note("%s %s %s failed: %s" % (objdump, cmd, self.name, e)) 110 bb.note("%s %s %s failed: %s" % (objdump, cmd, self.name, e))