Fix build system auto-selection breakage.

[debhelper.git] / dh_strip

diff --git a/dh_strip b/dh_strip
index 2796f9afb1d91645ed9e43e88ab92141cc82f06b..0da2e1e772446a32cdbe818ddb10773b6819c2df 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -77,7 +77,9 @@ Debian policy, version 3.0.1
 
 =cut
 
-init();
+init(options => {
+       "keep-debug" => \$dh{K_FLAG},
+});
 
 # This variable can be used to turn off stripping (see Policy).
 if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
@@ -113,7 +115,8 @@ sub testfile {
        return if $fn=~m/debug\/.*\.so/;
 
        # Does its filename look like a shared library?
-       if (m/.*\.so.*?/) {
+       # (*.cmxs are OCaml native code shared libraries)
+       if (m/.*\.(so.*?|cmxs$)/) {
                # Ok, do the expensive test.
                my $type=get_file_type($_);
                if ($type=~m/.*ELF.*shared.*/) {
@@ -137,7 +140,7 @@ sub testfile {
        if (m/lib.*\.a$/ && ! m/.*_g\.a$/) {
                # Is it a binary file, or something else (maybe a liner
                # script on Hurd, for example? I don't use file, because
-               # file returns a varity of things on static libraries.
+               # file returns a variety of things on static libraries.
                if (-B $_) {
                        push @static_libs, $fn;
                        return;