To upstream: dune build fixes (depends on previous to-upstream patches)

ocaml/boot/menhir/menhirLib.mli

@@ -1,3 +1,4 @@
+[@@@ocaml.warning "-67"]
 module General : sig
 (******************************************************************************)
 (*                                                                            *)

ocaml/bytecomp/dune

@@ -18,3 +18,10 @@
  (deps    (:instr (file ../runtime/caml/instruct.h)))
  (action
   (bash "%{dep:../tools/make_opcodes.exe} -opcodes < %{instr} > %{targets}")))
+
+(rule
+ (targets opcodes.mli)
+ (mode    fallback)
+ (deps    (:instr (file opcodes.ml)))
+ (action
+  (bash "ocamlc -i %{instr} > %{targets}")))

ocaml/debugger/dune

@@ -12,16 +12,19 @@
 ;*                                                                        *
 ;**************************************************************************
 
-; mshinwell: Disabled for now -- otherlibs/dynlink/dune needs fixing first.
+(ocamllex debugger_lexer)
+(ocamlyacc debugger_parser)
 
-;(ocamllex lexer)
-;(ocamlyacc parser)
-;
-;(executable
-; (name main)
-; (modes byte)
-; (flags (:standard -w -9))
-; (modules_without_implementation parser_aux)
-; (libraries ocamlcommon ocamltoplevel runtime stdlib unix))
-;
-;(rule (copy main.exe ocamldebug.byte))
+(executable
+  (name main)
+  (modes byte)
+  (flags (:standard -principal -w -9
+    -nostdlib -cclib "-I ../runtime" -cclib "-L ../runtime" -cclib -lcamlrun))
+  (link_deps (file ../stdlib/camlheader) (file ../runtime/libcamlrun.a))
+  (modules_without_implementation parser_aux)
+  (libraries ocamlcommon ocamltoplevel stdlib unix dynlink_internal))
+
+(install
+  (files (main.bc as ocamldebug))
+  (section bin)
+  (package ocaml))

ocaml/driver/dune

@@ -0,0 +1,10 @@
+; These rules work around a dune restriction which doesn't permit the same
+; compilation unit to be used in more than one executable or library.
+
+(rule
+  (targets main_native.ml)
+  (action (copy main.ml %{targets})))
+
+(rule
+  (targets optmain_native.ml)
+  (action (copy optmain.ml %{targets})))