Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf build: Display make commands on V=1

Get more verbose output wrt displaying executed commands from make.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Cc: Alexis Berlemont <alexis.berlemont@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-68v67h59zoz7ilb1ggcuff3j@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
ceed252f 9244e2c6

+30 -22
+3 -1
tools/build/Makefile.build
··· 13 13 14 14 ifeq ($(V),1) 15 15 quiet = 16 + Q = 16 17 else 17 18 quiet=quiet_ 19 + Q=@ 18 20 endif 19 21 20 22 build-dir := $(srctree)/tools/build ··· 104 102 PHONY += $(subdir-y) 105 103 106 104 $(subdir-y): 107 - @$(MAKE) -f $(build-dir)/Makefile.build dir=$(dir)/$@ obj=$(obj) 105 + $(Q)$(MAKE) -f $(build-dir)/Makefile.build dir=$(dir)/$@ obj=$(obj) 108 106 109 107 $(sort $(subdir-obj-y)): $(subdir-y) ; 110 108
+27 -21
tools/perf/Makefile.perf
··· 89 89 export VPATH 90 90 endif 91 91 92 + ifeq ($(V),1) 93 + Q = 94 + else 95 + Q = @ 96 + endif 97 + 92 98 # Do not use make's built-in rules 93 99 # (this improves performance and avoids hard-to-debug behaviour); 94 100 MAKEFLAGS += -r 95 101 96 102 $(OUTPUT)PERF-VERSION-FILE: ../../.git/HEAD 97 - @$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT) 98 - @touch $(OUTPUT)PERF-VERSION-FILE 103 + $(Q)$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT) 104 + $(Q)touch $(OUTPUT)PERF-VERSION-FILE 99 105 100 106 CC = $(CROSS_COMPILE)gcc 101 107 LD = $(CROSS_COMPILE)ld ··· 257 251 all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS) 258 252 259 253 please_set_SHELL_PATH_to_a_more_modern_shell: 260 - @$$(:) 254 + $(Q)$$(:) 261 255 262 256 shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell 263 257 ··· 270 264 build := -f $(srctree)/tools/build/Makefile.build dir=. obj 271 265 272 266 $(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE 273 - @$(MAKE) $(build)=perf 267 + $(Q)$(MAKE) $(build)=perf 274 268 275 269 $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) 276 270 $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(PERF_IN) $(LIBS) -o $@ 277 271 278 272 $(GTK_IN): FORCE 279 - @$(MAKE) $(build)=gtk 273 + $(Q)$(MAKE) $(build)=gtk 280 274 281 275 $(OUTPUT)libperf-gtk.so: $(GTK_IN) $(PERFLIBS) 282 276 $(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) ··· 321 315 single_dep: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h 322 316 323 317 $(OUTPUT)%.o: %.c single_dep FORCE 324 - @$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 318 + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 325 319 326 320 $(OUTPUT)%.i: %.c single_dep FORCE 327 - @$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 321 + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 328 322 329 323 $(OUTPUT)%.s: %.c single_dep FORCE 330 - @$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 324 + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 331 325 332 326 $(OUTPUT)%-bison.o: %.c single_dep FORCE 333 - @$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 327 + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 334 328 335 329 $(OUTPUT)%-flex.o: %.c single_dep FORCE 336 - @$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 330 + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 337 331 338 332 $(OUTPUT)%.o: %.S single_dep FORCE 339 - @$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 333 + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 340 334 341 335 $(OUTPUT)%.i: %.S single_dep FORCE 342 - @$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 336 + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 343 337 344 338 $(OUTPUT)perf-%: %.o $(PERFLIBS) 345 339 $(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(filter %.o,$^) $(LIBS) ··· 359 353 LIBPERF_IN := $(OUTPUT)libperf-in.o 360 354 361 355 $(LIBPERF_IN): FORCE 362 - @$(MAKE) $(build)=libperf 356 + $(Q)$(MAKE) $(build)=libperf 363 357 364 358 $(LIB_FILE): $(LIBPERF_IN) 365 359 $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS) ··· 367 361 LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 368 362 369 363 $(LIBTRACEEVENT): FORCE 370 - @$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) $(OUTPUT)libtraceevent.a plugins 364 + $(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) $(OUTPUT)libtraceevent.a plugins 371 365 372 366 $(LIBTRACEEVENT)-clean: 373 367 $(call QUIET_CLEAN, libtraceevent) 374 - @$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null 368 + $(Q)$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null 375 369 376 370 install-traceevent-plugins: $(LIBTRACEEVENT) 377 - @$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) install_plugins 371 + $(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) install_plugins 378 372 379 373 $(LIBAPI): FORCE 380 - @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapi.a 374 + $(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapi.a 381 375 382 376 $(LIBAPI)-clean: 383 377 $(call QUIET_CLEAN, libapi) 384 - @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null 378 + $(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null 385 379 386 380 help: 387 381 @echo 'Perf make targets:' ··· 519 513 # 520 514 config-clean: 521 515 $(call QUIET_CLEAN, config) 522 - @$(MAKE) -C config/feature-checks clean >/dev/null 516 + $(Q)$(MAKE) -C config/feature-checks clean >/dev/null 523 517 524 518 clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean 525 519 $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) 526 - @find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 527 - @$(RM) .config-detected 520 + $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 521 + $(Q)$(RM) .config-detected 528 522 $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 529 523 $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-FEATURES $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* 530 524 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean