equal
deleted
inserted
replaced
154 else |
154 else |
155 include $(GAMMADIR)/make/openjdk_distro |
155 include $(GAMMADIR)/make/openjdk_distro |
156 endif |
156 endif |
157 endif |
157 endif |
158 |
158 |
|
159 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK |
|
160 ifndef OPENJDK |
|
161 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) |
|
162 OPENJDK=true |
|
163 endif |
|
164 endif |
|
165 |
159 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
166 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
160 |
167 |
161 BUILDTREE = \ |
168 BUILDTREE = \ |
162 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) |
169 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) |
163 |
170 |
196 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ |
203 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ |
197 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ |
204 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ |
198 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ |
205 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ |
199 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
206 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
200 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
207 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
|
208 echo "OPENJDK = $(OPENJDK)"; \ |
201 echo; \ |
209 echo; \ |
202 echo "# Used for platform dispatching"; \ |
210 echo "# Used for platform dispatching"; \ |
203 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ |
211 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ |
204 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ |
212 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ |
205 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ |
213 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ |