< prev index next >

make/Init.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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

@@ -236,17 +236,15 @@
   endif
 
   ifeq ($(LOG_NOFILE), true)
     # Disable build log if LOG=[level,]nofile was given
     override BUILD_LOG_PIPE :=
-    override BUILD_LOG_PIPE_SIMPLE :=
   endif
 
   ifeq ($(filter dist-clean, $(SEQUENTIAL_TARGETS)), dist-clean)
     # We can't have a log file if we're about to remove it.
     override BUILD_LOG_PIPE :=
-    override BUILD_LOG_PIPE_SIMPLE :=
   endif
 
   ifeq ($(OUTPUT_SYNC_SUPPORTED), true)
     OUTPUT_SYNC_FLAG := -O$(OUTPUT_SYNC)
   endif

@@ -277,11 +275,11 @@
         ifneq ($(CONFIGURE_COMMAND_LINE), )
           $(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
         else
           $(ECHO) "Re-running configure using default settings"
         endif
-        ( cd $(CONFIGURE_START_DIR) && PATH="$(ORIGINAL_PATH)" AUTOCONF="$(AUTOCONF)" \
+        ( cd $(OUTPUTDIR) && PATH="$(ORIGINAL_PATH)" \
             CUSTOM_ROOT="$(CUSTOM_ROOT)" \
             CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
             $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
   ##############################################################################

@@ -303,11 +301,11 @@
   main: MAKEOVERRIDES :=
 
   main: $(INIT_TARGETS)
         ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
           $(call RotateLogFiles)
-          $(PRINTF) "Building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE_SIMPLE)
+          $(PRINTF) "Building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE)
           ifneq ($(SEQUENTIAL_TARGETS), )
             # Don't touch build output dir since we might be cleaning. That
             # means no log pipe.
             ( cd $(TOPDIR) && \
                 $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \

@@ -325,22 +323,22 @@
                     $(if $(JOBS), -j $(JOBS)) \
                     -f make/Main.gmk $(USER_MAKE_VARS) \
                     $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
                 ( exitcode=$$? && \
                 $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
-                    $(BUILD_LOG_PIPE_SIMPLE) && \
+                    $(BUILD_LOG_PIPE) && \
                 cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk \
                     HAS_SPEC=true on-failure ; \
                 exit $$exitcode ) )
             $(call CleanupSmartJavac)
             $(call StopGlobalTimer)
             $(call ReportBuildTimes)
           endif
           if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
             exit 1 ; \
           fi
-          $(PRINTF) "Finished building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE_SIMPLE)
+          $(PRINTF) "Finished building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE)
           $(call ReportProfileTimes)
         endif
 
     on-failure:
         $(call CleanupSmartJavac)
< prev index next >