diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2021-11-20 12:19:28 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2022-05-05 21:01:11 +0100 |
| commit | 8722ccd2a1096db3ae415d90c464bd8b254880db (patch) | |
| tree | 7fd5b27836f830dfd08f68144ebae409eb1ecd14 /compilerlibs | |
| parent | da78cf8698c4c6c60c267ff2030e45554e71e60c (diff) | |
| download | ocaml-8722ccd2a1096db3ae415d90c464bd8b254880db.tar.gz | |
Use fixed configuration for boot/ocamlc
Use the same configuration for boot/ocamlc regardless of the machine on
which the bootstrap is performed. Now set Config.in_boot_compiler to
true for boot/ocamlc.
Diffstat (limited to 'compilerlibs')
| -rw-r--r-- | compilerlibs/Makefile.compilerlibs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/compilerlibs/Makefile.compilerlibs b/compilerlibs/Makefile.compilerlibs index f6618999fc..4eb49ca60d 100644 --- a/compilerlibs/Makefile.compilerlibs +++ b/compilerlibs/Makefile.compilerlibs @@ -406,8 +406,14 @@ partialclean:: $(COMMON:.cmo=.cmx) $(BYTECOMP:.cmo=.cmx) $(OPTCOMP:.cmo=.cmx): ocamlopt$(EXE) $(OPTTOPLEVEL:.cmo=.cmx): ocamlopt$(EXE) +ALL_CONFIG_CMO = utils/config_main.cmo utils/config_boot.cmo -compilerlibs/ocamlcommon.cma: $(COMMON_CMI) $(COMMON) +utils/config_%.mli: utils/config.mli + cp $^ $@ + +beforedepend:: utils/config_main.mli utils/config_boot.mli + +compilerlibs/ocamlcommon.cma: $(COMMON_CMI) $(ALL_CONFIG_CMO) $(COMMON) $(CAMLC) -a -linkall -o $@ $(COMMON) partialclean:: rm -f compilerlibs/ocamlcommon.cma |