merge

1 files changed, 8 insertions, 1 deletions

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 045e9450..29d3f4d3 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -121,6 +121,13 @@ init(options => {
 	"add-udeb=s" => \$dh{SHLIBS_UDEB},
 });
 
+my $od = "objdump";
+# cross-compiling?
+if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE")
+    ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) {
+	$od=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-objdump";
+}
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
 	
@@ -146,7 +153,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	while (<FIND>) {
 		my ($library, $major);
 		push @lib_files, $_;
-		my $objdump=`objdump -p $_`;
+		my $objdump=`$od -p $_`;
 		if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
 			# proper soname format
 			$library=$1;