8222264: Windows incremental build is broken with JDK-8217728
Reviewed-by: erikj, clanger
This commit is contained in:
parent
4b898b7aae
commit
0f4b0947ff
@ -372,6 +372,7 @@ define SetupCompileNativeFileBody
|
|||||||
$(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \
|
$(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \
|
||||||
$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \
|
$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \
|
||||||
| $(SORT) -u >> $$($1_DEPS_FILE) ; \
|
| $(SORT) -u >> $$($1_DEPS_FILE) ; \
|
||||||
|
$(ECHO) >> $$($1_DEPS_FILE) ; \
|
||||||
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE)
|
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -843,6 +844,7 @@ define SetupNativeCompilationBody
|
|||||||
$(ECHO) $$($1_RES): \\ > $$($1_RES_DEPS_FILE) ; \
|
$(ECHO) $$($1_RES): \\ > $$($1_RES_DEPS_FILE) ; \
|
||||||
$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEPS_FILE).obj.log \
|
$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEPS_FILE).obj.log \
|
||||||
>> $$($1_RES_DEPS_FILE) ; \
|
>> $$($1_RES_DEPS_FILE) ; \
|
||||||
|
$(ECHO) >> $$($1_RES_DEPS_FILE) ;\
|
||||||
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEPS_FILE) \
|
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEPS_FILE) \
|
||||||
> $$($1_RES_DEPS_TARGETS_FILE)
|
> $$($1_RES_DEPS_TARGETS_FILE)
|
||||||
endif
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user