1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8154326: bash >(...) construct causes race conditions

Browse Source 
Reviewed-by: tbell, ihse
This commit is contained in:
Erik Joelsson 2016-04-22 10:48:12 +02:00
parent ee14387b53
commit f2c59f97ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/InitSupport.gmk
View File

@ -331,7 +331,7 @@ else # $(HAS_SPEC)=true
BUILD_LOG := $(OUTPUT_ROOT)/build.log BUILD_LOG := $(OUTPUT_ROOT)/build.log
BUILD_TRACE_LOG := $(OUTPUT_ROOT)/build-trace-time.log BUILD_TRACE_LOG := $(OUTPUT_ROOT)/build-trace-time.log
BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) && wait
# Sanity check the spec file, so it matches this source code # Sanity check the spec file, so it matches this source code
define CheckSpecSanity define CheckSpecSanity

4
make/common/MakeBase.gmk
View File

@ -706,10 +706,10 @@ endif
ExecuteWithLog = \ ExecuteWithLog = \
$(call LogCmdlines, Exececuting: [$(strip $2)]) \ $(call LogCmdlines, Exececuting: [$(strip $2)]) \
$(call WriteFile, $2, $(strip $1).cmdline) \ $(call WriteFile, $2, $(strip $1).cmdline) \
( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \ ( ( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
( exitcode=$(DOLLAR)? && \ ( exitcode=$(DOLLAR)? && \
$(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).log && \ $(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).log && \
exit $(DOLLAR)exitcode ) ) exit $(DOLLAR)exitcode ) ) && wait )
################################################################################ ################################################################################
# Find lib dir for module # Find lib dir for module