Mercurial > hg > truffle
comparison make/solaris/makefiles/buildtree.make @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | 75982791ddb6 |
children | 892acf0431ef |
comparison
equal
deleted
inserted
replaced
7065:cfacf5d5bade | 7066:7d815d842ee0 |
---|---|
146 else | 146 else |
147 include $(GAMMADIR)/make/openjdk_distro | 147 include $(GAMMADIR)/make/openjdk_distro |
148 endif | 148 endif |
149 endif | 149 endif |
150 | 150 |
151 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK | |
152 ifndef OPENJDK | |
153 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) | |
154 OPENJDK=true | |
155 endif | |
156 endif | |
157 | |
151 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) | 158 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
152 | 159 |
153 BUILDTREE = \ | 160 BUILDTREE = \ |
154 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) | 161 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) |
155 | 162 |
188 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ | 195 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ |
189 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ | 196 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ |
190 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ | 197 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ |
191 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ | 198 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
192 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ | 199 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
200 echo "OPENJDK = $(OPENJDK)"; \ | |
193 echo "$(LP64_SETTING/$(DATA_MODE))"; \ | 201 echo "$(LP64_SETTING/$(DATA_MODE))"; \ |
194 echo; \ | 202 echo; \ |
195 echo "# Used for platform dispatching"; \ | 203 echo "# Used for platform dispatching"; \ |
196 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ | 204 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ |
197 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ | 205 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ |