diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2023-01-18 03:38:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 09:38:49 +0100 |
| commit | 60260ec72adf6fb542ef022a2d58b26e966ba66a (patch) | |
| tree | d14db4c11d5ad818c00ae947088ca7661fe76fc8 /compilerlibs | |
| parent | ea02425ac683e3d8469a47d9b21e8389fa4a5a59 (diff) | |
| download | ocaml-60260ec72adf6fb542ef022a2d58b26e966ba66a.tar.gz | |
Less verbose logs from `make` (#11844)
Print concise summaries instead of full commands for some of the most verbose
commands. For example, print
```
OCAMLC lambda/switch.cmo
```
instead of
```
./boot/ocamlrun ./boot/ocamlc -nostdlib -I ./boot -use-prims runtime/primitives -g -strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48 -warn-error +a -bin-annot -strict-formats -I lambda -I utils -I parsing -I typing -I bytecomp -I file_formats -I lambda -I middle_end -I middle_end/closure -I middle_end/flambda -I middle_end/flambda/base_types -I asmcomp -I driver -I toplevel -I tools -c lambda/switch.ml
```
and
```
CC runtime/addrmap.b.o
```
instead of
```
gcc -c -O2 -fno-strict-aliasing -fwrapv -pthread -g -Wall -Werror -fno-common -fexcess-precision=standard -fno-tree-vrp -ffunction-sections -I./runtime -D_FILE_OFFSET_BITS=64 -DCAMLDLLIMPORT= -DIN_CAML_RUNTIME -o runtime/addrmap.b.o runtime/addrmap.c
```
The output is generated with the Make function `$(info ...)` to avoid shelling
out to `echo` each time, which can be expensive under Cygwin.
A variable `V` controls whether to use the new style. When `V=0` (the default),
it is used. If `V=1`, then the usual full output is used instead.
Co-authored-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Diffstat (limited to 'compilerlibs')
| -rw-r--r-- | compilerlibs/Makefile.compilerlibs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/compilerlibs/Makefile.compilerlibs b/compilerlibs/Makefile.compilerlibs index fc23c4ab4f..9d0052a258 100644 --- a/compilerlibs/Makefile.compilerlibs +++ b/compilerlibs/Makefile.compilerlibs @@ -426,33 +426,33 @@ $(addprefix compilerlibs/,\ CAMLC = $(BOOT_OCAMLC) $(BOOT_STDLIBFLAGS) -use-prims runtime/primitives compilerlibs/ocamlcommon.cma: $(COMMON_CMI) $(ALL_CONFIG_CMO) $(COMMON) - $(CAMLC) -a -linkall -o $@ $(COMMON) + $(V_LINKC)$(CAMLC) -a -linkall -o $@ $(COMMON) partialclean:: rm -f compilerlibs/ocamlcommon.cma compilerlibs/ocamlcommon.cmxa: $(COMMON_CMI) $(COMMON:.cmo=.cmx) - $(CAMLOPT) -a -linkall -o $@ $(COMMON:.cmo=.cmx) + $(V_LINKOPT)$(CAMLOPT) -a -linkall -o $@ $(COMMON:.cmo=.cmx) partialclean:: rm -f compilerlibs/ocamlcommon.cmxa \ compilerlibs/ocamlcommon.a compilerlibs/ocamlcommon.lib compilerlibs/ocamlbytecomp.cma: $(BYTECOMP_CMI) $(BYTECOMP) - $(CAMLC) -a -o $@ $(BYTECOMP) + $(V_LINKC)$(CAMLC) -a -o $@ $(BYTECOMP) partialclean:: rm -f compilerlibs/ocamlbytecomp.cma compilerlibs/ocamlbytecomp.cmxa: $(BYTECOMP_CMI) $(BYTECOMP:.cmo=.cmx) - $(CAMLOPT) -a $(OCAML_NATDYNLINKOPTS) -o $@ $(BYTECOMP:.cmo=.cmx) + $(V_LINKOPT)$(CAMLOPT) -a $(OCAML_NATDYNLINKOPTS) -o $@ $(BYTECOMP:.cmo=.cmx) partialclean:: rm -f compilerlibs/ocamlbytecomp.cmxa \ compilerlibs/ocamlbytecomp.a compilerlibs/ocamlbytecomp.lib compilerlibs/ocamlmiddleend.cma: $(MIDDLE_END_CMI) $(MIDDLE_END) - $(CAMLC) -a -o $@ $(MIDDLE_END) + $(V_LINKC)$(CAMLC) -a -o $@ $(MIDDLE_END) compilerlibs/ocamlmiddleend.cmxa: $(MIDDLE_END_CMI) $(MIDDLE_END:%.cmo=%.cmx) - $(CAMLOPT) -a -o $@ $(MIDDLE_END:%.cmo=%.cmx) + $(V_LINKOPT)$(CAMLOPT) -a -o $@ $(MIDDLE_END:%.cmo=%.cmx) partialclean:: rm -f compilerlibs/ocamlmiddleend.cma \ compilerlibs/ocamlmiddleend.cmxa \ @@ -461,24 +461,24 @@ partialclean:: compilerlibs/ocamloptcomp.cma: $(OPTCOMP_CMI) $(OPTCOMP) - $(CAMLC) -a -o $@ $(OPTCOMP) + $(V_LINKC)$(CAMLC) -a -o $@ $(OPTCOMP) partialclean:: rm -f compilerlibs/ocamloptcomp.cma compilerlibs/ocamloptcomp.cmxa: $(OPTCOMP_CMI) $(OPTCOMP:.cmo=.cmx) - $(CAMLOPT) -a -o $@ $(OPTCOMP:.cmo=.cmx) + $(V_LINKOPT)$(CAMLOPT) -a -o $@ $(OPTCOMP:.cmo=.cmx) partialclean:: rm -f compilerlibs/ocamloptcomp.cmxa \ compilerlibs/ocamloptcomp.a compilerlibs/ocamloptcomp.lib compilerlibs/ocamltoplevel.cma: $(TOPLEVEL_CMI) $(TOPLEVEL) - $(CAMLC) -a -o $@ -I toplevel/byte $(TOPLEVEL) + $(V_LINKC)$(CAMLC) -a -o $@ -I toplevel/byte $(TOPLEVEL) partialclean:: rm -f compilerlibs/ocamltoplevel.cma compilerlibs/ocamltoplevel.cmxa: $(OPTTOPLEVEL_CMI) $(OPTTOPLEVEL:.cmo=.cmx) - $(CAMLOPT) -a -o $@ -I toplevel/native $(OPTTOPLEVEL:.cmo=.cmx) + $(V_LINKOPT)$(CAMLOPT) -a -o $@ -I toplevel/native $(OPTTOPLEVEL:.cmo=.cmx) partialclean:: rm -f compilerlibs/ocamltoplevel.cmxa \ compilerlibs/ocamltoplevel.a compilerlibs/ocamltoplevel.lib |