Fix bug exposed by previous commit
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
parent
3e33d23535
commit
6a9c32dcb4
|
@ -12,6 +12,9 @@ next
|
|||
- Fix #1107. `-opaque` wasn't correctly being added to modules without
|
||||
an interface. (#1108, fix #1107, @rgrinberg)
|
||||
|
||||
- Fix a bug causing the toplevel `env` stanza in the workspace file to
|
||||
be ignored when at least one context had `(merlin)` (#1114, @diml)
|
||||
|
||||
1.1.0 (06/08/2018)
|
||||
------------------
|
||||
|
||||
|
|
|
@ -186,7 +186,7 @@ let t ?x ?profile:cmdline_profile () =
|
|||
Loc.fail (Context.loc ctx)
|
||||
"you can only have one context for merlin"
|
||||
| Opam { merlin = true; _ }, None ->
|
||||
{ merlin_context = Some name; contexts = ctx :: t.contexts; env = None }
|
||||
{ t with contexts = ctx :: t.contexts; merlin_context = Some name }
|
||||
| _ ->
|
||||
{ t with contexts = ctx :: t.contexts })
|
||||
in
|
||||
|
|
|
@ -3,19 +3,13 @@ Regression test for https://github.com/ocaml/dune/issues/1016#issuecomment-41139
|
|||
$ dune printenv
|
||||
Environment for context dev:
|
||||
(
|
||||
(flags
|
||||
(-w
|
||||
@a-4-29-40-41-42-44-45-48-58-59-60-40
|
||||
-strict-sequence
|
||||
-strict-formats
|
||||
-short-paths
|
||||
-keep-locs))
|
||||
(flags (dev-flags))
|
||||
(ocamlc_flags (-g))
|
||||
(ocamlopt_flags (-g))
|
||||
)
|
||||
Environment for context release:
|
||||
(
|
||||
(flags (-w -40))
|
||||
(flags (release-flags))
|
||||
(ocamlc_flags (-g))
|
||||
(ocamlopt_flags (-g))
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue