From 846c9c49a83c025dae71e04a0781aeb3e182c3e3 Mon Sep 17 00:00:00 2001
From: Mehdi Bouaziz <mbouaziz@fb.com>
Date: Fri, 26 May 2017 02:58:47 -0700
Subject: [PATCH] [Makefile] Reduce races of concurrent outputs

Reviewed By: jvillard

Differential Revision: D5123633

fbshipit-source-id: e6150c1
---
 Makefile.config | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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