Merge pull request #727 from bobot/fix_compilation_cmxs

Restore compilation of cmxs for 5.0
yallop · Feb 13, 2023 · dfef6bc · dfef6bc
2 parents 2ddd2c9 + b278b0f
commit dfef6bc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Makefile.rules b/Makefile.rules
@@ -70,7 +70,8 @@ LIB_TARGETS = $(BUILDDIR)/$(PROJECT).cma \
 ifeq ($(BEST),native)
 LIB_TARGETS += $(BUILDDIR)/$(PROJECT).cmxa
 endif
-ifneq ($(wildcard $(shell $(OCAMLFIND) ocamlc -where)/dynlink.cmxa),)
+OCAMLC_WHERE:=$(shell $(OCAMLFIND) ocamlc -where)
+ifneq ($(wildcard $(OCAMLC_WHERE)/dynlink.cmxa $(OCAMLC_WHERE)/dynlink/dynlink.cmxa),)
 LIB_TARGETS += $(BUILDDIR)/$(PROJECT).cmxs
 endif
 LIB_TARGET_EXTRAS = $(if $(STUB_LIB),$(BUILDDIR)/lib$(PROJECT)_stubs.a) \