1.1 --- a/make/defs.make Fri Oct 05 13:37:08 2012 -0700
1.2 +++ b/make/defs.make Wed Oct 10 14:35:58 2012 -0400
1.3 @@ -22,6 +22,27 @@
1.4 #
1.5 #
1.6
1.7 +# The common definitions for hotspot builds.
1.8 +
1.9 +# Optionally include SPEC file generated by configure.
1.10 +ifneq ($(SPEC),)
1.11 + include $(SPEC)
1.12 +endif
1.13 +
1.14 +# Directory paths and user name
1.15 +# Unless GAMMADIR is set on the command line, search upward from
1.16 +# the current directory for a parent directory containing "src/share/vm".
1.17 +# If that fails, look for $GAMMADIR in the environment.
1.18 +# When the tree of subdirs is built, this setting is stored in each flags.make.
1.19 +GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
1.20 +HS_SRC_DIR=$(GAMMADIR)/src
1.21 +HS_MAKE_DIR=$(GAMMADIR)/make
1.22 +HS_BUILD_DIR=$(GAMMADIR)/build
1.23 +
1.24 +ifeq ($(USER),)
1.25 + USER=$(USERNAME)
1.26 +endif
1.27 +
1.28 ifeq ($(HS_ALT_MAKE),)
1.29 ifneq ($(OPENJDK),true)
1.30 HS_ALT_MAKE=$(GAMMADIR)/make/closed
1.31 @@ -30,12 +51,10 @@
1.32 endif
1.33 endif
1.34
1.35 -# The common definitions for hotspot builds.
1.36 -
1.37 -# Optionally include SPEC file generated by configure.
1.38 -ifneq ($(SPEC),)
1.39 - include $(SPEC)
1.40 -endif
1.41 +#
1.42 +# Include alternate defs.make if it exists
1.43 +#
1.44 +-include $(HS_ALT_MAKE)/defs.make
1.45
1.46 # Default to verbose build logs (show all compile lines):
1.47 MAKE_VERBOSE=y
1.48 @@ -84,20 +103,6 @@
1.49 endif
1.50 endif
1.51
1.52 -# Directory paths and user name
1.53 -# Unless GAMMADIR is set on the command line, search upward from
1.54 -# the current directory for a parent directory containing "src/share/vm".
1.55 -# If that fails, look for $GAMMADIR in the environment.
1.56 -# When the tree of subdirs is built, this setting is stored in each flags.make.
1.57 -GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
1.58 -HS_SRC_DIR=$(GAMMADIR)/src
1.59 -HS_MAKE_DIR=$(GAMMADIR)/make
1.60 -HS_BUILD_DIR=$(GAMMADIR)/build
1.61 -
1.62 -ifeq ($(USER),)
1.63 - USER=$(USERNAME)
1.64 -endif
1.65 -
1.66 # hotspot version definitions
1.67 include $(GAMMADIR)/make/hotspot_version
1.68
1.69 @@ -339,3 +344,4 @@
1.70 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
1.71 endif
1.72
1.73 +.PHONY: $(HS_ALT_MAKE)/defs.make
