1.1 --- a/make/linux/makefiles/buildtree.make Thu Oct 04 20:09:46 2012 -0400 1.2 +++ b/make/linux/makefiles/buildtree.make Mon Oct 08 09:18:54 2012 -0400 1.3 @@ -156,6 +156,13 @@ 1.4 endif 1.5 endif 1.6 1.7 +# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK 1.8 +ifndef OPENJDK 1.9 + ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) 1.10 + OPENJDK=true 1.11 + endif 1.12 +endif 1.13 + 1.14 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 1.15 1.16 BUILDTREE = \ 1.17 @@ -198,6 +205,7 @@ 1.18 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 1.19 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 1.20 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 1.21 + echo "OPENJDK = $(OPENJDK)"; \ 1.22 echo; \ 1.23 echo "# Used for platform dispatching"; \ 1.24 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \