From 6aff7f3a8ab09f13fd4ef1313e524f73c613eaf5 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sun, 20 Jul 2014 19:33:08 +0000 Subject: . Don't hardcode /bin/bash. Fixes build trace output. --- java/openjdk8/files/patch-make-common-MakeBase.gmk | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 java/openjdk8/files/patch-make-common-MakeBase.gmk (limited to 'java/openjdk8') diff --git a/java/openjdk8/files/patch-make-common-MakeBase.gmk b/java/openjdk8/files/patch-make-common-MakeBase.gmk new file mode 100644 index 000000000000..1781510d5d7b --- /dev/null +++ b/java/openjdk8/files/patch-make-common-MakeBase.gmk @@ -0,0 +1,11 @@ +--- make/common/MakeBase.gmk.orig 2014-07-05 17:17:35.000000000 -0700 ++++ make/common/MakeBase.gmk 2014-07-05 17:17:51.000000000 -0700 +@@ -338,7 +338,7 @@ + # (and causing a crash on Cygwin). + # 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:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash ++ WRAPPER_SHELL:=bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log bash + 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 + # Never remove warning messages; this is just for completeness -- cgit v1.2.3