Install .cmxs with the executable bit set

  Fixes #4148

Signed-off-by: François Bobot <francois.bobot@cea.fr>

src/dune_rules/install_rules.ml

@@ -57,7 +57,8 @@ end = struct
     let virtual_library = Option.is_some (Lib_info.virtual_ lib) in
     let { Lib_config.ext_obj; _ } = lib_config in
     let archives = Lib_info.archives lib in
-    List.concat
+    List.concat_map
+      ~f:(List.map ~f:(fun f -> (Section.Lib, f)))
       [ archives.byte
       ; archives.native
       ; ( if virtual_library then
@@ -74,8 +75,8 @@ end = struct
          in
          Lib_info.eval_native_archives_exn lib ~modules)
       ; Lib_info.jsoo_runtime lib
-      ; (Lib_info.plugins lib).native
       ]
+    @ List.map ~f:(fun f -> (Section.Libexec, f)) (Lib_info.plugins lib).native
 
   let dll_files ~(modes : Mode.Dict.Set.t) ~dynlink ~(ctx : Context.t) lib =
     if_
@@ -191,7 +192,7 @@ end = struct
       [ sources
       ; List.map module_files ~f:(fun (sub_dir, file) ->
             make_entry ?sub_dir Lib file)
-      ; List.map lib_files ~f:(make_entry Lib)
+      ; List.map lib_files ~f:(fun (section, file) -> make_entry section file)
       ; List.map execs ~f:(make_entry Libexec)
       ; List.map dll_files ~f:(fun a ->
             (Some loc, Install.Entry.make Stublibs a))

test/blackbox-tests/test-cases/cross-compilation.t/run.t

@@ -32,9 +32,11 @@
     "_build/install/default.foo/lib/p/p.cmt" {"../../foo-sysroot/lib/p/p.cmt"}
     "_build/install/default.foo/lib/p/p.cmx" {"../../foo-sysroot/lib/p/p.cmx"}
     "_build/install/default.foo/lib/p/p.cmxa" {"../../foo-sysroot/lib/p/p.cmxa"}
-    "_build/install/default.foo/lib/p/p.cmxs" {"../../foo-sysroot/lib/p/p.cmxs"}
     "_build/install/default.foo/lib/p/p.ml" {"../../foo-sysroot/lib/p/p.ml"}
   ]
+  libexec: [
+    "_build/install/default.foo/lib/p/p.cmxs" {"../../foo-sysroot/lib/p/p.cmxs"}
+  ]
   bin: [
     "_build/install/default.foo/bin/blah" {"../foo-sysroot/bin/blah"}
   ]

test/blackbox-tests/test-cases/deprecated-library-name/features.t

@@ -72,9 +72,9 @@ deprecated library will be resolved in the installed world only.
   Installing $TESTCASE_ROOT/b/../_install/lib/b/b.cmt
   Installing $TESTCASE_ROOT/b/../_install/lib/b/b.cmx
   Installing $TESTCASE_ROOT/b/../_install/lib/b/b.cmxa
-  Installing $TESTCASE_ROOT/b/../_install/lib/b/b.cmxs
   Installing $TESTCASE_ROOT/b/../_install/lib/b/b.ml
   Installing $TESTCASE_ROOT/b/../_install/lib/b/dune-package
+  Installing $TESTCASE_ROOT/b/../_install/lib/b/b.cmxs
 
   $ rm -rf b
 

test/blackbox-tests/test-cases/foreign-library.t/run.t

@@ -715,9 +715,9 @@ Testsuite for the (foreign_library ...) stanza.
   Installing install/lib/external_library/extlib.cmt
   Installing install/lib/external_library/extlib.cmx
   Installing install/lib/external_library/extlib.cmxa
-  Installing install/lib/external_library/extlib.cmxs
   Installing install/lib/external_library/extlib.ml
   Installing install/lib/external_library/opam
+  Installing install/lib/external_library/extlib.cmxs
 
   $ echo "(lang dune 2.1)" > some/dir/dune-project
   $ cat >some/dir/dune <<EOF

test/blackbox-tests/test-cases/gen-opam-install-file.t/run.t

@@ -12,12 +12,14 @@ stubs and js files installed
     "_build/install/default/lib/foo/foo.cmt"
     "_build/install/default/lib/foo/foo.cmx"
     "_build/install/default/lib/foo/foo.cmxa"
-    "_build/install/default/lib/foo/foo.cmxs"
     "_build/install/default/lib/foo/foo.js"
     "_build/install/default/lib/foo/foo.ml"
     "_build/install/default/lib/foo/libfoo_stubs$ext_lib"
     "_build/install/default/lib/foo/opam"
   ]
+  libexec: [
+    "_build/install/default/lib/foo/foo.cmxs"
+  ]
   stublibs: [
     "_build/install/default/lib/stublibs/dllfoo_stubs$ext_dll"
   ]
@@ -76,11 +78,13 @@ unwrapped libraries have the correct artifacts
     "_build/install/default/lib/foo/foo.cmti"
     "_build/install/default/lib/foo/foo.cmx"
     "_build/install/default/lib/foo/foo.cmxa"
-    "_build/install/default/lib/foo/foo.cmxs"
     "_build/install/default/lib/foo/foo.ml"
     "_build/install/default/lib/foo/foo.mli"
     "_build/install/default/lib/foo/opam"
   ]
+  libexec: [
+    "_build/install/default/lib/foo/foo.cmxs"
+  ]
 
 wrapped lib with lib interface module
 
@@ -97,7 +101,6 @@ wrapped lib with lib interface module
     "_build/install/default/lib/foo/foo.cmt"
     "_build/install/default/lib/foo/foo.cmx"
     "_build/install/default/lib/foo/foo.cmxa"
-    "_build/install/default/lib/foo/foo.cmxs"
     "_build/install/default/lib/foo/foo.ml"
     "_build/install/default/lib/foo/foo__.cmi"
     "_build/install/default/lib/foo/foo__.cmt"
@@ -109,6 +112,9 @@ wrapped lib with lib interface module
     "_build/install/default/lib/foo/foo__Bar.cmx"
     "_build/install/default/lib/foo/opam"
   ]
+  libexec: [
+    "_build/install/default/lib/foo/foo.cmxs"
+  ]
 
 wrapped lib without lib interface module
 
@@ -125,11 +131,13 @@ wrapped lib without lib interface module
     "_build/install/default/lib/foo/foo.cmt"
     "_build/install/default/lib/foo/foo.cmx"
     "_build/install/default/lib/foo/foo.cmxa"
-    "_build/install/default/lib/foo/foo.cmxs"
     "_build/install/default/lib/foo/foo.ml"
     "_build/install/default/lib/foo/foo__Bar.cmi"
     "_build/install/default/lib/foo/foo__Bar.cmt"
     "_build/install/default/lib/foo/foo__Bar.cmti"
     "_build/install/default/lib/foo/foo__Bar.cmx"
     "_build/install/default/lib/foo/opam"
   ]
+  libexec: [
+    "_build/install/default/lib/foo/foo.cmxs"
+  ]

test/blackbox-tests/test-cases/github3727.t

@@ -44,9 +44,9 @@ visible regardless if the stanzas were filtered.
   Installing _install/lib/foo/bar/private_foo.cmt
   Installing _install/lib/foo/bar/private_foo.cmx
   Installing _install/lib/foo/bar/private_foo.cmxa
-  Installing _install/lib/foo/bar/private_foo.cmxs
   Installing _install/lib/foo/bar/private_foo.ml
   Installing _install/lib/foo/dune-package
+  Installing _install/lib/foo/bar/private_foo.cmxs
 
   $ export OCAMLPATH=$PWD/_install/lib
   $ dune build -p bar

test/blackbox-tests/test-cases/install-dry-run.t/run.t

@@ -8,9 +8,9 @@
   Installing OPAM_PREFIX/lib/mylib/mylib.cmt
   Installing OPAM_PREFIX/lib/mylib/mylib.cmx
   Installing OPAM_PREFIX/lib/mylib/mylib.cmxa
-  Installing OPAM_PREFIX/lib/mylib/mylib.cmxs
   Installing OPAM_PREFIX/lib/mylib/mylib.ml
   Installing OPAM_PREFIX/lib/mylib/opam
+  Installing OPAM_PREFIX/lib/mylib/mylib.cmxs
   Removing (if it exists) OPAM_PREFIX/lib/mylib/META
   Creating directory OPAM_PREFIX/lib/mylib
   Copying _build/install/default/lib/mylib/META to OPAM_PREFIX/lib/mylib/META (executable: false)
@@ -35,15 +35,15 @@
   Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxa
   Creating directory OPAM_PREFIX/lib/mylib
   Copying _build/install/default/lib/mylib/mylib.cmxa to OPAM_PREFIX/lib/mylib/mylib.cmxa (executable: false)
-  Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxs
-  Creating directory OPAM_PREFIX/lib/mylib
-  Copying _build/install/default/lib/mylib/mylib.cmxs to OPAM_PREFIX/lib/mylib/mylib.cmxs (executable: false)
   Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.ml
   Creating directory OPAM_PREFIX/lib/mylib
   Copying _build/install/default/lib/mylib/mylib.ml to OPAM_PREFIX/lib/mylib/mylib.ml (executable: false)
   Removing (if it exists) OPAM_PREFIX/lib/mylib/opam
   Creating directory OPAM_PREFIX/lib/mylib
   Copying _build/install/default/lib/mylib/opam to OPAM_PREFIX/lib/mylib/opam (executable: false)
+  Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxs
+  Creating directory OPAM_PREFIX/lib/mylib
+  Copying _build/install/default/lib/mylib/mylib.cmxs to OPAM_PREFIX/lib/mylib/mylib.cmxs (executable: true)
 
   $ dune uninstall --dry-run 2>&1 | sed 's#'$(opam config var prefix)'#OPAM_PREFIX#' | dune_cmd sanitize
   Removing (if it exists) OPAM_PREFIX/lib/mylib/META
@@ -54,7 +54,7 @@
   Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmt
   Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmx
   Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxa
-  Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxs
   Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.ml
   Removing (if it exists) OPAM_PREFIX/lib/mylib/opam
+  Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxs
   Removing directory (if empty) OPAM_PREFIX/lib/mylib

test/blackbox-tests/test-cases/install-libdir.t/run.t

@@ -13,9 +13,9 @@
   Installing install/lib/foo/foo.cmt
   Installing install/lib/foo/foo.cmx
   Installing install/lib/foo/foo.cmxa
-  Installing install/lib/foo/foo.cmxs
   Installing install/lib/foo/foo.ml
   Installing install/lib/foo/opam
+  Installing install/lib/foo/foo.cmxs
   Installing install/bin/exec
   Installing install/man/a-man-page-with-no-ext
   Installing install/man/man1/a-man-page.1
@@ -32,9 +32,9 @@ If prefix is passed, the default for libdir is `$prefix/lib`:
   Installing install/lib/foo/foo.cmt
   Installing install/lib/foo/foo.cmx
   Installing install/lib/foo/foo.cmxa
-  Installing install/lib/foo/foo.cmxs
   Installing install/lib/foo/foo.ml
   Installing install/lib/foo/opam
+  Installing install/lib/foo/foo.cmxs
   Installing install/bin/exec
   Installing install/man/a-man-page-with-no-ext
   Installing install/man/man1/a-man-page.1
@@ -63,15 +63,15 @@ If prefix is passed, the default for libdir is `$prefix/lib`:
   Removing (if it exists) install/lib/foo/foo.cmxa
   Creating directory install/lib/foo
   Copying _build/install/default/lib/foo/foo.cmxa to install/lib/foo/foo.cmxa (executable: false)
-  Removing (if it exists) install/lib/foo/foo.cmxs
-  Creating directory install/lib/foo
-  Copying _build/install/default/lib/foo/foo.cmxs to install/lib/foo/foo.cmxs (executable: false)
   Removing (if it exists) install/lib/foo/foo.ml
   Creating directory install/lib/foo
   Copying _build/install/default/lib/foo/foo.ml to install/lib/foo/foo.ml (executable: false)
   Removing (if it exists) install/lib/foo/opam
   Creating directory install/lib/foo
   Copying _build/install/default/lib/foo/opam to install/lib/foo/opam (executable: false)
+  Removing (if it exists) install/lib/foo/foo.cmxs
+  Creating directory install/lib/foo
+  Copying _build/install/default/lib/foo/foo.cmxs to install/lib/foo/foo.cmxs (executable: true)
   Removing (if it exists) install/bin/exec
   Creating directory install/bin
   Copying _build/install/default/bin/exec to install/bin/exec (executable: true)
@@ -99,9 +99,9 @@ destdir`:
   Installing /OCAMLFIND_DESTDIR/foo/foo.cmt
   Installing /OCAMLFIND_DESTDIR/foo/foo.cmx
   Installing /OCAMLFIND_DESTDIR/foo/foo.cmxa
-  Installing /OCAMLFIND_DESTDIR/foo/foo.cmxs
   Installing /OCAMLFIND_DESTDIR/foo/foo.ml
   Installing /OCAMLFIND_DESTDIR/foo/opam
+  Installing /OCAMLFIND_DESTDIR/foo/foo.cmxs
   Installing /OPAM_PREFIX/bin/exec
   Installing /OPAM_PREFIX/man/a-man-page-with-no-ext
   Installing /OPAM_PREFIX/man/man1/a-man-page.1
@@ -130,15 +130,15 @@ destdir`:
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmxa
   Creating directory /OCAMLFIND_DESTDIR/foo
   Copying _build/install/default/lib/foo/foo.cmxa to /OCAMLFIND_DESTDIR/foo/foo.cmxa (executable: false)
-  Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmxs
-  Creating directory /OCAMLFIND_DESTDIR/foo
-  Copying _build/install/default/lib/foo/foo.cmxs to /OCAMLFIND_DESTDIR/foo/foo.cmxs (executable: false)
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.ml
   Creating directory /OCAMLFIND_DESTDIR/foo
   Copying _build/install/default/lib/foo/foo.ml to /OCAMLFIND_DESTDIR/foo/foo.ml (executable: false)
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/opam
   Creating directory /OCAMLFIND_DESTDIR/foo
   Copying _build/install/default/lib/foo/opam to /OCAMLFIND_DESTDIR/foo/opam (executable: false)
+  Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmxs
+  Creating directory /OCAMLFIND_DESTDIR/foo
+  Copying _build/install/default/lib/foo/foo.cmxs to /OCAMLFIND_DESTDIR/foo/foo.cmxs (executable: true)
   Removing (if it exists) /OPAM_PREFIX/bin/exec
   Creating directory /OPAM_PREFIX/bin
   Copying _build/install/default/bin/exec to /OPAM_PREFIX/bin/exec (executable: true)
@@ -159,9 +159,9 @@ destdir`:
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmt
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmx
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmxa
-  Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmxs
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.ml
   Removing (if it exists) /OCAMLFIND_DESTDIR/foo/opam
+  Removing (if it exists) /OCAMLFIND_DESTDIR/foo/foo.cmxs
   Removing (if it exists) /OPAM_PREFIX/bin/exec
   Removing (if it exists) /OPAM_PREFIX/man/a-man-page-with-no-ext
   Removing (if it exists) /OPAM_PREFIX/man/man1/a-man-page.1
@@ -185,9 +185,9 @@ in libdir:
   Installing /LIBDIR/foo/foo.cmt
   Installing /LIBDIR/foo/foo.cmx
   Installing /LIBDIR/foo/foo.cmxa
-  Installing /LIBDIR/foo/foo.cmxs
   Installing /LIBDIR/foo/foo.ml
   Installing /LIBDIR/foo/opam
+  Installing /LIBDIR/foo/foo.cmxs
   Installing /OPAM_PREFIX/bin/exec
   Installing /OPAM_PREFIX/man/a-man-page-with-no-ext
   Installing /OPAM_PREFIX/man/man1/a-man-page.1
@@ -216,15 +216,15 @@ in libdir:
   Removing (if it exists) /LIBDIR/foo/foo.cmxa
   Creating directory /LIBDIR/foo
   Copying _build/install/default/lib/foo/foo.cmxa to /LIBDIR/foo/foo.cmxa (executable: false)
-  Removing (if it exists) /LIBDIR/foo/foo.cmxs
-  Creating directory /LIBDIR/foo
-  Copying _build/install/default/lib/foo/foo.cmxs to /LIBDIR/foo/foo.cmxs (executable: false)
   Removing (if it exists) /LIBDIR/foo/foo.ml
   Creating directory /LIBDIR/foo
   Copying _build/install/default/lib/foo/foo.ml to /LIBDIR/foo/foo.ml (executable: false)
   Removing (if it exists) /LIBDIR/foo/opam
   Creating directory /LIBDIR/foo
   Copying _build/install/default/lib/foo/opam to /LIBDIR/foo/opam (executable: false)
+  Removing (if it exists) /LIBDIR/foo/foo.cmxs
+  Creating directory /LIBDIR/foo
+  Copying _build/install/default/lib/foo/foo.cmxs to /LIBDIR/foo/foo.cmxs (executable: true)
   Removing (if it exists) /OPAM_PREFIX/bin/exec
   Creating directory /OPAM_PREFIX/bin
   Copying _build/install/default/bin/exec to /OPAM_PREFIX/bin/exec (executable: true)
@@ -245,9 +245,9 @@ in libdir:
   Removing (if it exists) /LIBDIR/foo/foo.cmt
   Removing (if it exists) /LIBDIR/foo/foo.cmx
   Removing (if it exists) /LIBDIR/foo/foo.cmxa
-  Removing (if it exists) /LIBDIR/foo/foo.cmxs
   Removing (if it exists) /LIBDIR/foo/foo.ml
   Removing (if it exists) /LIBDIR/foo/opam
+  Removing (if it exists) /LIBDIR/foo/foo.cmxs
   Removing (if it exists) /OPAM_PREFIX/bin/exec
   Removing (if it exists) /OPAM_PREFIX/man/a-man-page-with-no-ext
   Removing (if it exists) /OPAM_PREFIX/man/man1/a-man-page.1
@@ -270,9 +270,9 @@ This is the case when the prefix is implicit:
   Installing DESTDIR/OPAM_PREFIX/lib/foo/foo.cmt
   Installing DESTDIR/OPAM_PREFIX/lib/foo/foo.cmx
   Installing DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxa
-  Installing DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxs
   Installing DESTDIR/OPAM_PREFIX/lib/foo/foo.ml
   Installing DESTDIR/OPAM_PREFIX/lib/foo/opam
+  Installing DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxs
   Installing DESTDIR/OPAM_PREFIX/bin/exec
   Installing DESTDIR/OPAM_PREFIX/man/a-man-page-with-no-ext
   Installing DESTDIR/OPAM_PREFIX/man/man1/a-man-page.1
@@ -301,15 +301,15 @@ This is the case when the prefix is implicit:
   Removing (if it exists) DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxa
   Creating directory DESTDIR/OPAM_PREFIX/lib/foo
   Copying _build/install/default/lib/foo/foo.cmxa to DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxa (executable: false)
-  Removing (if it exists) DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxs
-  Creating directory DESTDIR/OPAM_PREFIX/lib/foo
-  Copying _build/install/default/lib/foo/foo.cmxs to DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxs (executable: false)
   Removing (if it exists) DESTDIR/OPAM_PREFIX/lib/foo/foo.ml
   Creating directory DESTDIR/OPAM_PREFIX/lib/foo
   Copying _build/install/default/lib/foo/foo.ml to DESTDIR/OPAM_PREFIX/lib/foo/foo.ml (executable: false)
   Removing (if it exists) DESTDIR/OPAM_PREFIX/lib/foo/opam
   Creating directory DESTDIR/OPAM_PREFIX/lib/foo
   Copying _build/install/default/lib/foo/opam to DESTDIR/OPAM_PREFIX/lib/foo/opam (executable: false)
+  Removing (if it exists) DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxs
+  Creating directory DESTDIR/OPAM_PREFIX/lib/foo
+  Copying _build/install/default/lib/foo/foo.cmxs to DESTDIR/OPAM_PREFIX/lib/foo/foo.cmxs (executable: true)
   Removing (if it exists) DESTDIR/OPAM_PREFIX/bin/exec
   Creating directory DESTDIR/OPAM_PREFIX/bin
   Copying _build/install/default/bin/exec to DESTDIR/OPAM_PREFIX/bin/exec (executable: true)
@@ -334,9 +334,9 @@ But also when the prefix is explicit:
   Installing DESTDIR/prefix/lib/foo/foo.cmt
   Installing DESTDIR/prefix/lib/foo/foo.cmx
   Installing DESTDIR/prefix/lib/foo/foo.cmxa
-  Installing DESTDIR/prefix/lib/foo/foo.cmxs
   Installing DESTDIR/prefix/lib/foo/foo.ml
   Installing DESTDIR/prefix/lib/foo/opam
+  Installing DESTDIR/prefix/lib/foo/foo.cmxs
   Installing DESTDIR/prefix/bin/exec
   Installing DESTDIR/prefix/man/a-man-page-with-no-ext
   Installing DESTDIR/prefix/man/man1/a-man-page.1
@@ -365,15 +365,15 @@ But also when the prefix is explicit:
   Removing (if it exists) DESTDIR/prefix/lib/foo/foo.cmxa
   Creating directory DESTDIR/prefix/lib/foo
   Copying _build/install/default/lib/foo/foo.cmxa to DESTDIR/prefix/lib/foo/foo.cmxa (executable: false)
-  Removing (if it exists) DESTDIR/prefix/lib/foo/foo.cmxs
-  Creating directory DESTDIR/prefix/lib/foo
-  Copying _build/install/default/lib/foo/foo.cmxs to DESTDIR/prefix/lib/foo/foo.cmxs (executable: false)
   Removing (if it exists) DESTDIR/prefix/lib/foo/foo.ml
   Creating directory DESTDIR/prefix/lib/foo
   Copying _build/install/default/lib/foo/foo.ml to DESTDIR/prefix/lib/foo/foo.ml (executable: false)
   Removing (if it exists) DESTDIR/prefix/lib/foo/opam
   Creating directory DESTDIR/prefix/lib/foo
   Copying _build/install/default/lib/foo/opam to DESTDIR/prefix/lib/foo/opam (executable: false)
+  Removing (if it exists) DESTDIR/prefix/lib/foo/foo.cmxs
+  Creating directory DESTDIR/prefix/lib/foo
+  Copying _build/install/default/lib/foo/foo.cmxs to DESTDIR/prefix/lib/foo/foo.cmxs (executable: true)
   Removing (if it exists) DESTDIR/prefix/bin/exec
   Creating directory DESTDIR/prefix/bin
   Copying _build/install/default/bin/exec to DESTDIR/prefix/bin/exec (executable: true)
@@ -398,9 +398,9 @@ DESTDIR can also be passed as a command line flag.
   Installing DESTDIR/prefix/lib/foo/foo.cmt
   Installing DESTDIR/prefix/lib/foo/foo.cmx
   Installing DESTDIR/prefix/lib/foo/foo.cmxa
-  Installing DESTDIR/prefix/lib/foo/foo.cmxs
   Installing DESTDIR/prefix/lib/foo/foo.ml
   Installing DESTDIR/prefix/lib/foo/opam
+  Installing DESTDIR/prefix/lib/foo/foo.cmxs
   Installing DESTDIR/prefix/bin/exec
   Installing DESTDIR/prefix/man/a-man-page-with-no-ext
   Installing DESTDIR/prefix/man/man1/a-man-page.1
@@ -429,15 +429,15 @@ DESTDIR can also be passed as a command line flag.
   Removing (if it exists) DESTDIR/prefix/lib/foo/foo.cmxa
   Creating directory DESTDIR/prefix/lib/foo
   Copying _build/install/default/lib/foo/foo.cmxa to DESTDIR/prefix/lib/foo/foo.cmxa (executable: false)
-  Removing (if it exists) DESTDIR/prefix/lib/foo/foo.cmxs
-  Creating directory DESTDIR/prefix/lib/foo
-  Copying _build/install/default/lib/foo/foo.cmxs to DESTDIR/prefix/lib/foo/foo.cmxs (executable: false)
   Removing (if it exists) DESTDIR/prefix/lib/foo/foo.ml
   Creating directory DESTDIR/prefix/lib/foo
   Copying _build/install/default/lib/foo/foo.ml to DESTDIR/prefix/lib/foo/foo.ml (executable: false)
   Removing (if it exists) DESTDIR/prefix/lib/foo/opam
   Creating directory DESTDIR/prefix/lib/foo
   Copying _build/install/default/lib/foo/opam to DESTDIR/prefix/lib/foo/opam (executable: false)
+  Removing (if it exists) DESTDIR/prefix/lib/foo/foo.cmxs
+  Creating directory DESTDIR/prefix/lib/foo
+  Copying _build/install/default/lib/foo/foo.cmxs to DESTDIR/prefix/lib/foo/foo.cmxs (executable: true)
   Removing (if it exists) DESTDIR/prefix/bin/exec
   Creating directory DESTDIR/prefix/bin
   Copying _build/install/default/bin/exec to DESTDIR/prefix/bin/exec (executable: true)