Mercurial > hg > openjdk > jdk9
changeset 2061:3463a3f14f0f jdk-9+119
8156837: RC resource compilation on windows generates false build failure reports
Reviewed-by: tbell, prr
| author | erikj |
|---|---|
| date | Fri, 13 May 2016 09:21:20 +0200 |
| parents | 996f9fa4f8e6 |
| children | e3b62687563c 48aaedf3cc38 278dbe271a52 |
| files | make/common/NativeCompilation.gmk |
| diffstat | 1 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/NativeCompilation.gmk Thu May 12 18:46:14 2016 +0000 +++ b/make/common/NativeCompilation.gmk Fri May 13 09:21:20 2016 +0200 @@ -770,13 +770,20 @@ $$(call ExecuteWithLog, $$@, \ $$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \ $$($1_VERSIONINFO_RESOURCE)) - # Windows RC compiler does not support -showIncludes, so we mis-use CL for this. + # Windows RC compiler does not support -showIncludes, so we mis-use CL + # for this. Filter out RC specific arguments that are unknown to CL. + # For some unknown reason, in this case CL actually outputs the show + # includes to stderr so need to redirect it to hide the output from the + # main log. $$(call ExecuteWithLog, $$($1_RES_DEP).obj, \ - $$($1_CC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \ - $(CC_OUT_OPTION)$$($1_RES_DEP).obj -P -Fi$$($1_RES_DEP).pp \ - $$($1_VERSIONINFO_RESOURCE)) > $$($1_RES_DEP).raw 2>&1 || true ; \ + $$($1_CC) $$(filter-out -l%, $$($1_RC_FLAGS)) \ + $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \ + $(CC_OUT_OPTION)$$($1_RES_DEP).obj -P -Fi$$($1_RES_DEP).pp \ + $$($1_VERSIONINFO_RESOURCE)) 2>&1 \ + | $(GREP) -v -e "^Note: including file:" \ + -e "^$$(notdir $$($1_VERSIONINFO_RESOURCE))$$$$" || test "$$$$?" = "1" ; \ $(ECHO) $$($1_RES): \\ > $$($1_RES_DEP) ; \ - $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).raw >> $$($1_RES_DEP) ; \ + $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).obj.log >> $$($1_RES_DEP) ; \ $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEP) > $$($1_RES_DEP_TARGETS) endif endif