From 46c95bbe0616fc37cb56866a57939487f45eca00 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Fri, 6 Mar 2009 00:00:58 +0000 Subject: [PATCH] Fix a parallel make race condition by swapping the order of -I directories. The .cmi files are generated in $(ObjDir) and then copied to $(OcamlDir). The ocamldep output references the .cmi files in $(ObjDir), so make kicks off a dependent compile as soon as the local copy is generated. If the copy to $(OcamlDir) is not complete at that point, the compiler will read the partially copied file and complain about a "Corrupted compiled interface". Searching $(ObjDir) first avoids this. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66217 91177308-0d34-0410-b5e6-96231b3b80d8 --- bindings/ocaml/Makefile.ocaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml index 9ca9fb742a9..d98a489f7c4 100644 --- a/bindings/ocaml/Makefile.ocaml +++ b/bindings/ocaml/Makefile.ocaml @@ -37,7 +37,7 @@ UsedLibNames = $(shell $(LLVM_CONFIG) --libnames $(UsedComponents)) endif # Tools -OCAMLCFLAGS += -I $(OcamlDir) -I $(ObjDir) +OCAMLCFLAGS += -I $(ObjDir) -I $(OcamlDir) ifneq ($(ObjectsO),) OCAMLAFLAGS += $(patsubst %,-cclib %, \ $(filter-out -L$(LibDir),-l$(LIBRARYNAME) \ @@ -297,7 +297,7 @@ endif $(ObjDir)/$(LIBRARYNAME).odoc: $(ObjectsCMI) $(Echo) "Documenting $(notdir $@)" - $(Verb) $(OCAMLDOC) -I $(OcamlDir) -I $(ObjDir) -dump $@ $(OcamlHeaders) + $(Verb) $(OCAMLDOC) -I $(ObjDir) -I $(OcamlDir) -dump $@ $(OcamlHeaders) ocamldoc: $(ObjDir)/$(LIBRARYNAME).odoc -- 2.34.1