Mercurial > hg > truffle

comparison make/linux/makefiles/buildtree.make @ 6858:b261523fe66c hs25-b05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 12 Oct 2012 13:55:52 -0700
parents 9855b7e559ae
children e522a00b91aa 892acf0431ef
comparison
equal deleted inserted replaced
6829:0cc77f9b31ad 6858:b261523fe66c
55 # The makefiles are split this way so that "make foo" will run faster by not 55 # The makefiles are split this way so that "make foo" will run faster by not
56 # having to read the dependency files for the vm. 56 # having to read the dependency files for the vm.
57 57
58 -include $(SPEC) 58 -include $(SPEC)
59 include $(GAMMADIR)/make/scm.make 59 include $(GAMMADIR)/make/scm.make
60 include $(GAMMADIR)/make/defs.make
60 include $(GAMMADIR)/make/altsrc.make 61 include $(GAMMADIR)/make/altsrc.make
61 62
62 63
63 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. 64 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details.
64 QUIETLY$(MAKE_VERBOSE) = @ 65 QUIETLY$(MAKE_VERBOSE) = @
154 else 155 else
155 include $(GAMMADIR)/make/openjdk_distro 156 include $(GAMMADIR)/make/openjdk_distro
156 endif 157 endif
157 endif 158 endif
158 159
160 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK
161 ifndef OPENJDK
162 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true)
163 OPENJDK=true
164 endif
165 endif
166
159 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 167 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
160 168
161 BUILDTREE = \ 169 BUILDTREE = \
162 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) 170 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
163 171
186 echo; \ 194 echo; \
187 echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ 195 echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
188 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ 196 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
189 echo; \ 197 echo; \
190 echo "GAMMADIR = $(GAMMADIR)"; \ 198 echo "GAMMADIR = $(GAMMADIR)"; \
199 echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \
200 echo "OSNAME = $(OSNAME)"; \
191 echo "SYSDEFS = \$$(Platform_sysdefs)"; \ 201 echo "SYSDEFS = \$$(Platform_sysdefs)"; \
192 echo "SRCARCH = $(SRCARCH)"; \ 202 echo "SRCARCH = $(SRCARCH)"; \
193 echo "BUILDARCH = $(BUILDARCH)"; \ 203 echo "BUILDARCH = $(BUILDARCH)"; \
194 echo "LIBARCH = $(LIBARCH)"; \ 204 echo "LIBARCH = $(LIBARCH)"; \
195 echo "TARGET = $(TARGET)"; \ 205 echo "TARGET = $(TARGET)"; \
196 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ 206 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \
197 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ 207 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \
198 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 208 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
199 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 209 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
200 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 210 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
211 echo "OPENJDK = $(OPENJDK)"; \
201 echo; \ 212 echo; \
202 echo "# Used for platform dispatching"; \ 213 echo "# Used for platform dispatching"; \
203 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ 214 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
204 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ 215 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \
205 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ 216 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \
252 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ 263 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
253 echo; \ 264 echo; \
254 [ -n "$(SPEC)" ] && \ 265 [ -n "$(SPEC)" ] && \
255 echo "include $(SPEC)"; \ 266 echo "include $(SPEC)"; \
256 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ 267 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
268 echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
257 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ 269 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
258 ) > $@ 270 ) > $@
259 271
260 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst 272 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
261 @echo Creating $@ ... 273 @echo Creating $@ ...