Skip to content

Restore obj dir for utop toplevels #1734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 4, 2019
Merged

Restore obj dir for utop toplevels #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/utop.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ let setup sctx ~dir =
let expander = Super_context.expander sctx ~dir in
let scope = Super_context.find_scope_by_dir sctx dir in
let utop_exe_dir = utop_exe_dir ~dir in
let obj_dir = Obj_dir.make_exe ~dir:utop_exe_dir ~name:main_module_filename in
let obj_dir = Obj_dir.make_exe ~dir:utop_exe_dir ~name:exe_name in
let db = Scope.libs scope in
let libs = libs_under_dir sctx ~db ~dir in
let modules =
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox-tests/test-cases/utop/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$ dune utop --display short forutop -- init_forutop.ml
ocamldep forutop/.utop/.utop.ml.eobjs/utop.ml.d
ocamldep forutop/.utop/.utop.eobjs/utop.ml.d
ocamldep forutop/.forutop.objs/forutop.ml.d
ocamlc forutop/.forutop.objs/byte/forutop.{cmi,cmo,cmt}
ocamlc forutop/forutop.cma
ocamlc forutop/.utop/.utop.ml.eobjs/byte/utop.{cmi,cmo,cmt}
ocamlc forutop/.utop/.utop.eobjs/byte/utop.{cmi,cmo,cmt}
ocamlc forutop/.utop/utop.exe
hello in utop