summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--ocamlbuild/ocaml_specific.ml1
2 files changed, 3 insertions, 0 deletions
diff --git a/Changes b/Changes
index 1c1f9b2aa..465d14757 100644
--- a/Changes
+++ b/Changes
@@ -59,6 +59,8 @@ Toplevel and debugger:
OCamlbuild:
- PR#6237: explicit "infer" tag to control or disable menhir --infer
(Hugo Heuzard)
+- PR#6625: pass -linkpkg to files built with -output-obj.
+ (Peter Zotov)
- PR#6702: explicit "linkpkg" and "dontlink(foo)" flags
(Peter Zotov, Gabriel Scherer)
- PR#6712: Ignore common VCS directories
diff --git a/ocamlbuild/ocaml_specific.ml b/ocamlbuild/ocaml_specific.ml
index 6a4194e85..1d0b8a8e4 100644
--- a/ocamlbuild/ocaml_specific.ml
+++ b/ocamlbuild/ocaml_specific.ml
@@ -559,6 +559,7 @@ let () =
(* Ocamlfind will link the archives for us. *)
flag ["ocaml"; "link"; "program"] & A"-linkpkg";
flag ["ocaml"; "link"; "toplevel"] & A"-linkpkg";
+ flag ["ocaml"; "link"; "output_obj"] & A"-linkpkg";
(* "program" will make sure that -linkpkg is passed when compiling
whole-programs (.byte and .native); but it is occasionally