Fix #597

CHANGES.md

@@ -28,6 +28,9 @@ next
   `ext_lib`, `ext_dll` and `ext_exe` as well as `${ocaml-config:XXX}`
   for most variables in the output of `ocamlc -config` (#590)
 
+- Make sure modules in the current directory always have precedence
+  over included directories (#597)
+
 1.0+beta18 (25/02/2018)
 -----------------------
 

src/module_compilation.ml

@@ -95,12 +95,12 @@ let build_cm sctx ?sandbox ~dynlink ~flags ~cm_kind ~dep_graphs
            ~extra_targets
            [ Dyn (fun (_, ocaml_flags) -> As ocaml_flags)
            ; cmt_args
+           ; A "-I"; Path obj_dir
            ; Dyn (fun (libs, _) ->
                Lib.L.include_flags libs ~stdlib_dir:ctx.stdlib_dir)
            ; As extra_args
            ; if dynlink || cm_kind <> Cmx then As [] else A "-nodynlink"
            ; A "-no-alias-deps"; opaque
-           ; A "-I"; Path obj_dir
            ; (match alias_module with
               | None -> S []
               | Some (m : Module.t) ->

test/blackbox-tests/test-cases/github597/run.t

@@ -1,7 +1 @@
   $ $JBUILDER build --root . -j1 --display quiet b/b.cma
-        ocamlc b/.b.objs/plop.{cmi,cmo,cmt} (exit 2)
-  (cd _build/default && /home/dim/.opam/4.05.0/bin/ocamlc.opt -w -40 -g -bin-annot -I a/.a.objs -no-alias-deps -I b/.b.objs -o b/.b.objs/plop.cmo -c -impl b/plop.ml)
-  File "b/plop.ml", line 1, characters 23-28:
-  Error: This expression has type int but an expression was expected of type
-           string
-  [1]