. Don't hardcode /bin/bash. Fixes build trace output.

This commit is contained in:
Greg Lewis 2014-07-20 19:33:08 +00:00
parent 586ceb34f7
commit 6aff7f3a8a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362358

View file

@ -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