summaryrefslogtreecommitdiff
path: root/compilerlibs
diff options
context:
space:
mode:
authorLouis Gesbert <louis.gesbert@ocamlpro.com>2021-01-26 16:02:40 +0100
committerGitHub <noreply@github.com>2021-01-26 15:02:40 +0000
commitc2bbc6fc4e971c7efb628c8141c2452d22833ae6 (patch)
treebac8b418d7c1b8e33f383a75a3aaf39609eb76ae /compilerlibs
parenta59d3aaed72d415482f61a50ee850c01ac07b49d (diff)
downloadocaml-c2bbc6fc4e971c7efb628c8141c2452d22833ae6.tar.gz
Factorise bytecode and native toplevels (#10124)
Introduce modules Topeval and Topcommon to share common code between the bytecode and native toplevel.
Diffstat (limited to 'compilerlibs')
-rw-r--r--compilerlibs/Makefile.compilerlibs22
1 files changed, 13 insertions, 9 deletions
diff --git a/compilerlibs/Makefile.compilerlibs b/compilerlibs/Makefile.compilerlibs
index 9389e27396..f632d1cd76 100644
--- a/compilerlibs/Makefile.compilerlibs
+++ b/compilerlibs/Makefile.compilerlibs
@@ -261,17 +261,21 @@ MIDDLE_END_CMI=\
OPTCOMP=$(MIDDLE_END) $(ASMCOMP)
OPTCOMP_CMI=$(MIDDLE_END_CMI) $(ASMCOMP_CMI)
-TOPLEVEL=toplevel/genprintval.cmo toplevel/byte/toploop.cmo \
- toplevel/byte/trace.cmo toplevel/byte/topdirs.cmo toplevel/byte/topmain.cmo
-TOPLEVEL_CMI=toplevel/byte/toploop.cmi toplevel/byte/trace.cmi \
- toplevel/byte/topdirs.cmi toplevel/byte/topmain.cmi
-
-OPTTOPLEVEL=toplevel/genprintval.cmo toplevel/native/toploop.cmo \
- toplevel/native/topdirs.cmo toplevel/native/topmain.cmo
-OPTTOPLEVEL_CMI=toplevel/native/toploop.cmi toplevel/native/topdirs.cmi \
+TOPLEVEL=toplevel/genprintval.cmo toplevel/topcommon.cmo \
+ toplevel/byte/topeval.cmo toplevel/byte/trace.cmo toplevel/toploop.cmo \
+ toplevel/topdirs.cmo toplevel/byte/topmain.cmo
+TOPLEVEL_CMI=toplevel/topcommon.cmi toplevel/byte/topeval.cmi \
+ toplevel/byte/trace.cmi toplevel/toploop.cmi toplevel/topdirs.cmi \
+ toplevel/byte/topmain.cmi
+
+OPTTOPLEVEL=toplevel/genprintval.cmo toplevel/topcommon.cmo \
+ toplevel/native/topeval.cmo toplevel/native/trace.cmo toplevel/toploop.cmo \
+ toplevel/topdirs.cmo toplevel/native/topmain.cmo
+OPTTOPLEVEL_CMI=toplevel/topcommon.cmi toplevel/native/topeval.cmi \
+ toplevel/native/trace.cmi toplevel/toploop.cmi toplevel/topdirs.cmi \
toplevel/native/topmain.cmi
-TOPLEVEL_SHARED_MLIS = toploop.mli trace.mli topdirs.mli topmain.mli
+TOPLEVEL_SHARED_MLIS = topeval.mli trace.mli topmain.mli
toplevel/byte/%.mli toplevel/byte/%.cmi: toplevel/%.mli toplevel/%.cmi
cp toplevel/$*.mli toplevel/$*.cmi $(@D)