Use pack in ocamldebug

debugger/Makefile

@@ -52,7 +52,10 @@ libraries = $(ROOTDIR)/compilerlibs/ocamlcommon.cma \
 
 all: ocamldebug$(EXE)
 
-ocamldebug$(EXE): $(libraries) $(all_objects)
+Ocamldebug.cmo: $(all_objects)
+	$(CAMLC) -pack $(COMPFLAGS) -o $@ $^
+
+ocamldebug$(EXE): $(libraries) Ocamldebug.cmo
 	$(CAMLC) $(LINKFLAGS) -o $@ -linkall $^
 
 install:
@@ -63,10 +66,10 @@ clean::
 	rm -f *.cmo *.cmi
 
 %.cmo: %.ml
-	$(CAMLC) -c $(COMPFLAGS) $<
+	$(CAMLC) -c $(COMPFLAGS) -for-pack Ocamldebug $<
 
 %.cmi: %.mli
-	$(CAMLC) -c $(COMPFLAGS) $<
+	$(CAMLC) -c $(COMPFLAGS) -for-pack Ocamldebug $<
 
 depend: beforedepend
 	$(CAMLDEP) $(DEPFLAGS) $(DEPINCLUDES) *.mli *.ml \

testsuite/tests/tool-debugger/module_named_main/input_script

@@ -0,0 +1,7 @@
+load_printer main.cmo
+install_printer Main.Submodule.pp
+goto 0
+break @ Main 26
+run
+print value
+quit

testsuite/tests/tool-debugger/module_named_main/main.ml

@@ -0,0 +1,30 @@
+(* TEST
+flags += " -g "
+ocamldebug_script = "${test_source_directory}/input_script"
+* debugger
+** shared-libraries
+*** setup-ocamlc.byte-build-env
+**** ocamlc.byte
+***** check-ocamlc.byte-output
+****** ocamldebug
+******* check-program-output
+*)
+
+module Submodule = struct
+
+  type t = unit
+
+  let value = ()
+
+  let pp (fmt : Format.formatter) (_ : t) : unit =
+    Format.fprintf fmt "DEBUG: Aux.Submodule.pp"
+
+end
+
+let debug () =
+  let value = Submodule.value in
+  ignore value
+
+;;
+
+debug ();

testsuite/tests/tool-debugger/module_named_main/main.reference

@@ -0,0 +1,6 @@
+File main.cmo loaded
+Loading program... done.
+Beginning of program.
+Breakpoint: 1
+26   <|b|>ignore value
+value: unit = DEBUG: Aux.Submodule.pp