< prev index next >

make/GenerateLinkOptData.gmk

Print this page

        

@@ -57,29 +57,19 @@
 # image, so just use the external build jdk instead.
 ifeq ($(EXTERNAL_BUILDJDK), true)
   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)/%, %, $@))
         $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
         $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
             -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
-            -Duser.language=en -Duser.country=US \
             -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
             build.tools.classlist.HelloClasslist \
-            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 \
-            )
+            $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
         $(GREP) -v HelloClasslist $@.raw > $@
 
 # The jli trace is created by the same recipe as classlist. By declaring these
 # dependencies, make will correctly rebuild both jli trace and classlist
 # incrementally using the single recipe above.
< prev index next >