equal
deleted
inserted
replaced
161 else |
161 else |
162 include $(GAMMADIR)/make/openjdk_distro |
162 include $(GAMMADIR)/make/openjdk_distro |
163 endif |
163 endif |
164 endif |
164 endif |
165 |
165 |
|
166 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK |
|
167 ifndef OPENJDK |
|
168 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) |
|
169 OPENJDK=true |
|
170 endif |
|
171 endif |
|
172 |
166 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
173 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
167 |
174 |
168 BUILDTREE = \ |
175 BUILDTREE = \ |
169 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) |
176 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) |
170 |
177 |
203 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ |
210 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ |
204 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ |
211 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ |
205 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ |
212 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ |
206 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
213 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
207 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
214 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
|
215 echo "OPENJDK = $(OPENJDK)"; \ |
208 echo; \ |
216 echo; \ |
209 echo "# Used for platform dispatching"; \ |
217 echo "# Used for platform dispatching"; \ |
210 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ |
218 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ |
211 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ |
219 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ |
212 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ |
220 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ |