32 lines
1015 B
Diff
32 lines
1015 B
Diff
From ec542c5cc09c49a7af9072581d5090bc18bfb6ec Mon Sep 17 00:00:00 2001
|
||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
Date: Sat, 9 Dec 2023 12:22:40 +0000
|
||
Subject: [PATCH] ocaml-dep.sh: Add common/mlcustomize to list of directories
|
||
to search
|
||
|
||
Avoids this error when you change a file under common/mlcustomize and
|
||
then rebuild virt-v2v:
|
||
|
||
Error: Files ../convert/mlconvert.cmxa
|
||
and ../common/mlcustomize/mlcustomize.cmxa
|
||
make inconsistent assumptions over implementation Inject_virtio_win
|
||
|
||
Fixes: commit 4b9c8e1560d67ac17e287450f61f4903d237fc47
|
||
See-also: commit c30df7ffb8fc04142b99cbb7ec1bebbb32ffb654
|
||
---
|
||
ocaml-dep.sh.in | 1 +
|
||
1 file changed, 1 insertion(+)
|
||
|
||
diff --git a/ocaml-dep.sh.in b/ocaml-dep.sh.in
|
||
index 1e191d6d..7f3130e5 100755
|
||
--- a/ocaml-dep.sh.in
|
||
+++ b/ocaml-dep.sh.in
|
||
@@ -33,6 +33,7 @@ set -e
|
||
# directories must have unique names (eg. not ‘Utils’) else
|
||
# dependencies don't get built right.
|
||
include_dirs="
|
||
+common/mlcustomize
|
||
common/mldrivers
|
||
common/mlgettext
|
||
common/mlpcre
|