29 lines
899 B
Diff
29 lines
899 B
Diff
From b6db2f65596470492f0ad76d1ed63ddb98b17167 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Mon, 11 Jan 2016 19:46:37 +0000
|
|
Subject: [PATCH 05/10] ocaml: Avoid race when building NBDKit.cmi.
|
|
|
|
If both the NBDKit.cmi and NBDKit.cmx builds run in parallel, both
|
|
will try to build NBDKit.cmi, resulting in a corrupt NBDKit.cmi file.
|
|
Avoid this by adding an extra dependency.
|
|
---
|
|
plugins/ocaml/Makefile.am | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/ocaml/Makefile.am b/plugins/ocaml/Makefile.am
|
|
index d4776b3..f63ba33 100644
|
|
--- a/plugins/ocaml/Makefile.am
|
|
+++ b/plugins/ocaml/Makefile.am
|
|
@@ -43,7 +43,7 @@ ocamllib_DATA = NBDKit.mli NBDKit.cmi NBDKit.cmx NBDKit.o
|
|
NBDKit.cmi: NBDKit.mli
|
|
$(OCAMLC) -c $<
|
|
|
|
-NBDKit.cmx: NBDKit.ml
|
|
+NBDKit.cmx: NBDKit.ml NBDKit.cmi
|
|
$(OCAMLOPT) $(OCAMLOPTFLAGS) -c $<
|
|
NBDKit.o: NBDKit.cmx
|
|
|
|
--
|
|
2.7.4
|
|
|