8248488: JDK-8246484 actually broke COMPARE_BUILD
Reviewed-by: erikj
This commit is contained in:
parent
5a6954abba
commit
682e836d60
@ -197,7 +197,7 @@ ifeq ($(HAS_SPEC),)
|
|||||||
COMPARE_BUILD="$(COMPARE_BUILD)" pre-compare-build && \
|
COMPARE_BUILD="$(COMPARE_BUILD)" pre-compare-build && \
|
||||||
$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
|
$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
|
||||||
SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
|
SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
|
||||||
COMPARE_BUILD="$(COMPARE_BUILD)" main && \
|
COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" main && \
|
||||||
$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
|
$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
|
||||||
SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
|
SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
|
||||||
COMPARE_BUILD="$(COMPARE_BUILD)" post-compare-build && \
|
COMPARE_BUILD="$(COMPARE_BUILD)" post-compare-build && \
|
||||||
|
@ -350,6 +350,9 @@ else # $(HAS_SPEC)=true
|
|||||||
$$(if $$(filter FAIL=%, $$(part)), \
|
$$(if $$(filter FAIL=%, $$(part)), \
|
||||||
$$(eval COMPARE_BUILD_FAIL=$$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
|
$$(eval COMPARE_BUILD_FAIL=$$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
|
||||||
) \
|
) \
|
||||||
|
$$(if $$(filter NODRYRUN=%, $$(part)), \
|
||||||
|
$$(eval COMPARE_BUILD_NODRYRUN=$$(strip $$(subst +, , $$(patsubst NODRYRUN=%, %, $$(part))))) \
|
||||||
|
) \
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
# Separate handling for single field case, to allow for spaces in values.
|
# Separate handling for single field case, to allow for spaces in values.
|
||||||
@ -372,9 +375,11 @@ else # $(HAS_SPEC)=true
|
|||||||
else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
|
else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
|
||||||
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
|
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
|
||||||
endif
|
endif
|
||||||
PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
|
ifneq ($$(COMPARE_BUILD_NODRYRUN), true)
|
||||||
ifeq ($$(PATCH_DRY_RUN), FAILED)
|
PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
|
||||||
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
|
ifeq ($$(PATCH_DRY_RUN), FAILED)
|
||||||
|
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifneq ($$(COMPARE_BUILD_FAIL), true)
|
ifneq ($$(COMPARE_BUILD_FAIL), true)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user