[xen staging] tools/ocaml: Drop the OCAMLOPTFLAG_G invocation

[patchbot@xxxxxxx]

commit 126293eae6485089471ebdfd91fe944a0274e613
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Aug 23 10:52:41 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Aug 23 15:02:27 2024 +0100

    tools/ocaml: Drop the OCAMLOPTFLAG_G invocation
    
    These days, `ocamlopt -h` asks you whether you meant --help instead, meaning
    that the $(shell ) invocation here isn't going end up containing '-g'.
    
    Make it unconditional, like it is in OCAMLCFLAGS already.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Christian Lindig <christian.lindig@xxxxxxxxx>
    Reviewed-by: Edwin Török <edwin.torok@xxxxxxxxx>
---
 tools/ocaml/common.make | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make
index cc126b749f..708d74617c 100644
--- a/tools/ocaml/common.make
+++ b/tools/ocaml/common.make
@@ -11,8 +11,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) 
-w F -warn-error F
+OCAMLOPTFLAGS = -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