[Makefile] Reduce races of concurrent outputs

Reviewed By: jvillard

Differential Revision: D5123633

fbshipit-source-id: e6150c1
master
Mehdi Bouaziz 8 years ago committed by Facebook Github Bot
parent 0c8222cb2f
commit 846c9c49a8

@ -163,9 +163,8 @@ define silent_on_success
UNIX_START_DATE=$$(date +"%s"); \ UNIX_START_DATE=$$(date +"%s"); \
HUMAN_START_DATE=$$(date +"%H:%M:%S"); \ HUMAN_START_DATE=$$(date +"%H:%M:%S"); \
if [ -z $(SILENT) ]; then \ if [ -z $(SILENT) ]; then \
printf "[%s][%$(MAX_PID_SIZE)s] $(TERM_INFO)" "$$HUMAN_START_DATE" "$$HASH"; \ printf "[%s][%$(MAX_PID_SIZE)s] $(TERM_INFO)%s...$(TERM_RESET)\n" \
printf '%s' "$(1)"; \ "$$HUMAN_START_DATE" "$$HASH" "$(1)"; \
printf '...$(TERM_RESET)\n'; \
fi; \ fi; \
$(MKDIR_P) $(ABSOLUTE_ROOT_DIR)/_build_logs; \ $(MKDIR_P) $(ABSOLUTE_ROOT_DIR)/_build_logs; \
($(2)) 1>$(ABSOLUTE_ROOT_DIR)/_build_logs/cmd-$$HASH.out \ ($(2)) 1>$(ABSOLUTE_ROOT_DIR)/_build_logs/cmd-$$HASH.out \
@ -184,10 +183,8 @@ define silent_on_success
exit 1; \ exit 1; \
elif [ -z $(SILENT) ]; then \ elif [ -z $(SILENT) ]; then \
UNIX_END_DATE=$$(date +"%s"); \ UNIX_END_DATE=$$(date +"%s"); \
printf '[%7ss][%$(MAX_PID_SIZE)s] $(TERM_SUCCESS)SUCCESS ' \ printf '[%7ss][%$(MAX_PID_SIZE)s] $(TERM_SUCCESS)SUCCESS %s$(TERM_RESET)\n' \
"$$(($$UNIX_END_DATE - $$UNIX_START_DATE))" "$$HASH"; \ "$$(($$UNIX_END_DATE - $$UNIX_START_DATE))" "$$HASH" "$(1)"; \
printf '%s' "$(1)"; \
printf '$(TERM_RESET)\n'; \
fi fi
endef endef
endif endif

Loading…
Cancel
Save