< prev index next >

make/InitSupport.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -262,13 +262,17 @@
       ifeq ($(strip $1), FORCE)
         $$(shell rm -f $$(main_targets_file))
       endif
     endif
 
+    # The --no-print-directory is needed to make the call from
+    # FindTest.gmk to Test.gmk work with LOG=debug/trace. See
+    # JDK-8213736
     $$(main_targets_file):
         @( cd $$(topdir) && \
-        $$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(topdir)/make/Main.gmk \
+        $$(MAKE) $$(MAKE_LOG_FLAGS) -r -R --no-print-directory \
+            -f $$(topdir)/make/Main.gmk \
             -I $$(topdir)/make/common SPEC=$(strip $2) NO_RECIPES=true \
             $$(MAKE_LOG_VARS) \
             create-main-targets-include )
 
     # Now include main-targets.gmk. This will define ALL_MAIN_TARGETS.

@@ -294,13 +298,10 @@
   # Define basic logging setup
   BUILD_LOG := $(OUTPUTDIR)/build.log
   BUILD_PROFILE_LOG := $(OUTPUTDIR)/build-profile.log
 
   BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) && wait
-  # Use this for simple echo/printf commands that are never expected to print
-  # to stderr.
-  BUILD_LOG_PIPE_SIMPLE := | $(TEE) -a $(BUILD_LOG)
 
   ifneq ($(CUSTOM_ROOT), )
     topdir=$(CUSTOM_ROOT)
   else
     topdir=$(TOPDIR)

@@ -385,11 +386,11 @@
         else \
           $(MKDIR) -p $(OUTPUTDIR); \
         fi
         # Re-run configure with the same arguments (and possibly some additional),
         # must be done after patching.
-        ( cd $(CONFIGURE_START_DIR) && PATH="$(ORIGINAL_PATH)" \
+        ( cd $(OUTPUTDIR) && PATH="$(ORIGINAL_PATH)" \
             $(BASH) $(topdir)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
   endef
 
   # Cleanup after a compare build
   define CleanupCompareBuild

@@ -480,11 +481,11 @@
   define CleanupSmartJavac
         [ -f $(SJAVAC_SERVER_DIR)/server.port ] && $(ECHO) Stopping sjavac server && \
             $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
   endef
 
-  ifeq ($(call isBuildOs, windows), true)
+  ifeq ($(OPENJDK_BUILD_OS), windows)
     # On windows we need to synchronize with the javac server to be able to
     # move or remove the build output directory. Since we have no proper
     # synchronization process, wait for a while and hope it helps. This is only
     # used by build comparisons.
     define WaitForSmartJavacFinish

@@ -515,21 +516,21 @@
             "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
             "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
             "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | \
             $(XARGS) $(CAT) | $(SORT) -k 2`" \
             "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`" \
-            $(BUILD_LOG_PIPE_SIMPLE)
+            $(BUILD_LOG_PIPE)
   endef
 
   define ReportProfileTimes
     $(if $(findstring true, $(LOG_PROFILE_TIMES_LOG)), \
       [ ! -f $(BUILD_PROFILE_LOG) ] || \
       { $(ECHO) Begin $(notdir $(BUILD_PROFILE_LOG)) && \
         $(CAT) $(BUILD_PROFILE_LOG) && \
         $(ECHO) End $(notdir $(BUILD_PROFILE_LOG)); \
       } \
-      $(BUILD_LOG_PIPE_SIMPLE)
+      $(BUILD_LOG_PIPE)
     )
   endef
 
 endif # HAS_SPEC
 
< prev index next >