changeset 1960:009487c0169b

8151300: Build shell trace functionality lost in JDK-8076060 Reviewed-by: tbell
author erikj
date Mon, 07 Mar 2016 09:13:56 +0100
parents 83fe2455dcc1
children 2436705f4a75
files make/common/MakeBase.gmk
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/MakeBase.gmk	Thu Mar 03 12:25:50 2016 -0800
+++ b/make/common/MakeBase.gmk	Mon Mar 07 09:13:56 2016 +0100
@@ -282,7 +282,7 @@
     # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
     # Only use time if it's GNU time which supports format and output file.
     WRAPPER_SHELL := $$(BASH) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log $$(SHELL)
-    SHELL := $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
+    SHELL = $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
   endif
   # The warn level can never be turned off
   LogWarn = $$(info $$(strip $$1))