1.1 --- a/make/defs.make Mon Mar 19 20:13:17 2012 +0100
1.2 +++ b/make/defs.make Mon Mar 19 10:09:24 2012 +0100
1.3 @@ -55,6 +55,27 @@
1.4 @$(RM) $@
1.5 endef
1.6
1.7 +# Default values for JVM_VARIANT* variables if configure hasn't set
1.8 +# it already.
1.9 +ifeq ($(JVM_VARIANTS),)
1.10 + ifeq ($(ZERO_BUILD), true)
1.11 + ifeq ($(SHARK_BUILD), true)
1.12 + JVM_VARIANTS:=zeroshark
1.13 + JVM_VARIANT_ZEROSHARK:=true
1.14 + else
1.15 + JVM_VARIANTS:=zero
1.16 + JVM_VARIANT_ZERO:=true
1.17 + endif
1.18 + else
1.19 + # A default is needed
1.20 + ifeq ($(BUILD_CLIENT_ONLY), true)
1.21 + JVM_VARIANTS:=client
1.22 + JVM_VARIANT_CLIENT:=true
1.23 + endif
1.24 + # Further defaults are platform and arch specific
1.25 + endif
1.26 +endif
1.27 +
1.28 # Directory paths and user name
1.29 # Unless GAMMADIR is set on the command line, search upward from
1.30 # the current directory for a parent directory containing "src/share/vm".
