From: Andrew Cooper Date: Mon, 25 Nov 2024 10:56:41 +0000 (+0100) Subject: tools/ocaml: Drop the OCAMLOPTFLAG_G invocation X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2914b2b19cfe2ab9cdf7f78af5068c1277617ba9;p=people%2Faperard%2Fxen-unstable.git 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 Acked-by: Christian Lindig Reviewed-by: Edwin Török master commit: 126293eae6485089471ebdfd91fe944a0274e613 master date: 2024-08-23 15:02:27 +0100 --- 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