X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_strip;h=4dc69616f971a5678374526e172a577f948a4ba5;hb=a4cf3e83f425663c6c190791fe3ea92b7143191a;hp=b4098be6fd23b5164e3c269b09a64aee70dd5c61;hpb=7bc99d44cfc0275e1b44b390bed1362c457da9ab;p=debhelper.git

diff --git a/dh_strip b/dh_strip
index b4098be..4dc6961 100755
--- a/dh_strip
+++ b/dh_strip
@@ -82,18 +82,12 @@ init(options => {
 });
 
 # This variable can be used to turn off stripping (see Policy).
-if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
+if (get_buildoption('nostrip')) {
 	exit;
 }
 
-my $objcopy = "objcopy";
-my $strip = "strip";
-# cross-compiling?
-if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE")
-    ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) {
-	$objcopy=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-objcopy";
-	$strip=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-strip";
-}
+my $objcopy = cross_command("objcopy");
+my $strip = cross_command("strip");
 
 # I could just use `file $_[0]`, but this is safer
 sub get_file_type {
@@ -172,7 +166,12 @@ sub make_debug {
 	if (! -d $debug_dir) {
 		doit("install", "-d", $debug_dir);
 	}
-	doit($objcopy, "--only-keep-debug", $file, $debug_path);
+	if (compat(8)) {
+		doit($objcopy, "--only-keep-debug", $file, $debug_path);
+	}
+	else {
+		doit($objcopy, "--only-keep-debug", "--compress-debug-sections", $file, $debug_path);
+	}
 	# No reason for this to be executable.
 	doit("chmod", 644, $debug_path);
 	return $debug_path;