31 |
31 |
32 ifndef _INITSUPPORT_GMK |
32 ifndef _INITSUPPORT_GMK |
33 _INITSUPPORT_GMK := 1 |
33 _INITSUPPORT_GMK := 1 |
34 |
34 |
35 ifeq ($(HAS_SPEC),) |
35 ifeq ($(HAS_SPEC),) |
|
36 |
|
37 # Include the corresponding closed file, if present. |
|
38 # Normal hook mechanism cannot be used since we have no SPEC. |
|
39 -include $(topdir)/closed/make/InitSupport.gmk |
|
40 |
36 ############################################################################## |
41 ############################################################################## |
37 # Helper functions for the initial part of Init.gmk, before the spec file is |
42 # Helper functions for the initial part of Init.gmk, before the spec file is |
38 # loaded. Most of these functions provide parsing and setting up make options |
43 # loaded. Most of these functions provide parsing and setting up make options |
39 # from the command-line. |
44 # from the command-line. |
40 ############################################################################## |
45 ############################################################################## |
41 |
46 |
42 # Make control variables, handled by Init.gmk |
47 # Make control variables, handled by Init.gmk |
43 INIT_CONTROL_VARIABLES := LOG CONF CONF_NAME SPEC JOBS TEST_JOBS CONF_CHECK \ |
48 INIT_CONTROL_VARIABLES += LOG CONF CONF_NAME SPEC JOBS TEST_JOBS CONF_CHECK \ |
44 COMPARE_BUILD |
49 COMPARE_BUILD JTREG GTEST |
45 |
50 |
46 # All known make control variables |
51 # All known make control variables |
47 MAKE_CONTROL_VARIABLES := $(INIT_CONTROL_VARIABLES) TEST JDK_FILTER |
52 MAKE_CONTROL_VARIABLES := $(INIT_CONTROL_VARIABLES) TEST JDK_FILTER |
48 |
53 |
49 # Define a simple reverse function. |
54 # Define a simple reverse function. |
496 endef |
501 endef |
497 |
502 |
498 define PrepareFailureLogs |
503 define PrepareFailureLogs |
499 $(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \ |
504 $(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \ |
500 $(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs |
505 $(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs |
|
506 $(RM) $(MAKESUPPORT_OUTPUTDIR)/exit-with-error 2> /dev/null |
501 endef |
507 endef |
502 |
508 |
503 # Remove any javac server logs and port files. This |
509 # Remove any javac server logs and port files. This |
504 # prevents a new make run to reuse the previous servers. |
510 # prevents a new make run to reuse the previous servers. |
505 define PrepareSmartJavac |
511 define PrepareSmartJavac |