OpenJDK / jdk / jdk
changeset 53589:9ee67f08fdaa
8204564: Need better error output when GenerateLinkOptData fails
Reviewed-by: ihse, tbell
| author | erikj |
|---|---|
| date | Thu, 31 Jan 2019 08:39:28 -0800 |
| parents | a5f46c4690f8 |
| children | ce36f8180d03 |
| files | make/GenerateLinkOptData.gmk |
| diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/GenerateLinkOptData.gmk Thu Jan 31 11:19:58 2019 -0500 +++ b/make/GenerateLinkOptData.gmk Thu Jan 31 08:39:28 2019 -0800 @@ -59,6 +59,8 @@ INTERIM_IMAGE_DIR := $(BUILD_JDK) endif +# Save the stderr output of the command and print it along with stdout in case +# something goes wrong. $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR) $(call MakeDir, $(LINK_OPT_DIR)) $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@)) @@ -67,7 +69,14 @@ -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \ build.tools.classlist.HelloClasslist \ - $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE) + 2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \ + || ( \ + exitcode=$$? ; \ + $(ECHO) "ERROR: Failed to generate link optimization data." \ + "This is likely a problem with the newly built JVM/JDK." ; \ + $(CAT) $(LINK_OPT_DIR)/stderr $(JLI_TRACE_FILE) ; \ + exit $$exitcode \ + ) $(GREP) -v HelloClasslist $@.raw > $@ # The jli trace is created by the same recipe as classlist. By declaring these