summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-11-28 15:15:48 +0000
committerKoen Kooi <koen@openembedded.org>2006-11-28 15:15:48 +0000
commitf22607c68edda356b86c5b5433c316b49546275d (patch)
tree2bc531b081893e2af3993a8ffee3a906197a1fcc
parent85fd8977a23877d01352fdbd87998a36a0bbe0ff (diff)
parent4b127550884048827753325400f10a2e9461a07b (diff)
merge of '190c717fcefa9f89f739dac0295c41c977c5f2da'
and '1fb8812d36f505cfabe9ee2335441ada60e32f83'
-rw-r--r--classes/package.bbclass2
-rw-r--r--conf/bitbake.conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 4909fc61df..c53b3ee708 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -575,7 +575,7 @@ python package_do_shlibs() {
soname = None
path = os.path.join(root, file)
if os.access(path, os.X_OK) or lib_re.match(file):
- cmd = (bb.data.getVar('BUILD_PREFIX', d, 1) or "") + "objdump -p " + path + " 2>/dev/null"
+ cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
fd = os.popen(cmd)
lines = fd.readlines()
fd.close()
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f49f26b7da..92c7cef2dd 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -233,6 +233,7 @@ export AS = "${HOST_PREFIX}as"
export RANLIB = "${HOST_PREFIX}ranlib"
export STRIP = "${HOST_PREFIX}strip"
export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"