[xen staging] tools/ocaml: Remove '-cc $(CC)' from OCAMLOPTFLAGS

[patchbot@xxxxxxx]

commit 0d69635d27cb1d011ccdf419b2bc85cc7809ac92
Author:     Andrii Sultanov <andrii.sultanov@xxxxxxxxx>
AuthorDate: Thu Aug 22 10:06:02 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Aug 23 10:44:24 2024 +0100

    tools/ocaml: Remove '-cc $(CC)' from OCAMLOPTFLAGS
    
    This option does not work as one might expect, and needs to be the full
    compiler invocation including linking arguments to operate correctly.
    
    See https://github.com/ocaml/ocaml/issues/12284 for more details.
    
    Signed-off-by: Andrii Sultanov <andrii.sultanov@xxxxxxxxx>
    Acked-by: Christian Lindig <christian.lindig@xxxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 tools/ocaml/common.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make
index 0c8a597d5b..cc126b749f 100644
--- a/tools/ocaml/common.make
+++ b/tools/ocaml/common.make
@@ -12,7 +12,7 @@ OCAMLFIND ?= ocamlfind
 CFLAGS += -fPIC -I$(shell ocamlc -where)
 
 OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')
-OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) 
-cc $(CC) -w F -warn-error F
+OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) 
-w F -warn-error F
 OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F
 
 VERSION := 4.1
--
generated by git-patchbot for /home/xen/git/xen.git#staging