Fix #597
This commit is contained in:
parent
bc2b740c4c
commit
5286b42f58
|
@ -32,6 +32,10 @@ next
|
||||||
generic and should support several inline test systems such as
|
generic and should support several inline test systems such as
|
||||||
`ppx_inline_test`, `ppx_expect` or `qtest` (#547)
|
`ppx_inline_test`, `ppx_expect` or `qtest` (#547)
|
||||||
|
|
||||||
|
- Make sure modules in the current directory always have precedence
|
||||||
|
over included directories (#597)
|
||||||
|
|
||||||
|
|
||||||
1.0+beta18 (25/02/2018)
|
1.0+beta18 (25/02/2018)
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
|
|
|
@ -95,12 +95,12 @@ let build_cm sctx ?sandbox ~dynlink ~flags ~cm_kind ~dep_graphs
|
||||||
~extra_targets
|
~extra_targets
|
||||||
[ Dyn (fun (_, ocaml_flags) -> As ocaml_flags)
|
[ Dyn (fun (_, ocaml_flags) -> As ocaml_flags)
|
||||||
; cmt_args
|
; cmt_args
|
||||||
|
; A "-I"; Path obj_dir
|
||||||
; Dyn (fun (libs, _) ->
|
; Dyn (fun (libs, _) ->
|
||||||
Lib.L.include_flags libs ~stdlib_dir:ctx.stdlib_dir)
|
Lib.L.include_flags libs ~stdlib_dir:ctx.stdlib_dir)
|
||||||
; As extra_args
|
; As extra_args
|
||||||
; if dynlink || cm_kind <> Cmx then As [] else A "-nodynlink"
|
; if dynlink || cm_kind <> Cmx then As [] else A "-nodynlink"
|
||||||
; A "-no-alias-deps"; opaque
|
; A "-no-alias-deps"; opaque
|
||||||
; A "-I"; Path obj_dir
|
|
||||||
; (match alias_module with
|
; (match alias_module with
|
||||||
| None -> S []
|
| None -> S []
|
||||||
| Some (m : Module.t) ->
|
| Some (m : Module.t) ->
|
||||||
|
|
|
@ -1,7 +1 @@
|
||||||
$ $JBUILDER build --root . -j1 --display quiet b/b.cma
|
$ $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]
|
|
||||||
|
|
Loading…
Reference in New Issue