Mercurial > hg > graal-compiler

comparison make/bsd/makefiles/buildtree.make @ 6948:e522a00b91aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 9855b7e559ae
children 892acf0431ef
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 # 1 #
2 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
58 # needs to be set here since this Makefile doesn't include defs.make 58 # needs to be set here since this Makefile doesn't include defs.make
59 OS_VENDOR:=$(shell uname -s) 59 OS_VENDOR:=$(shell uname -s)
60 60
61 -include $(SPEC) 61 -include $(SPEC)
62 include $(GAMMADIR)/make/scm.make 62 include $(GAMMADIR)/make/scm.make
63 include $(GAMMADIR)/make/defs.make
63 include $(GAMMADIR)/make/altsrc.make 64 include $(GAMMADIR)/make/altsrc.make
64 65
65 66
66 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. 67 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details.
67 QUIETLY$(MAKE_VERBOSE) = @ 68 QUIETLY$(MAKE_VERBOSE) = @
161 else 162 else
162 include $(GAMMADIR)/make/openjdk_distro 163 include $(GAMMADIR)/make/openjdk_distro
163 endif 164 endif
164 endif 165 endif
165 166
167 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK
168 ifndef OPENJDK
169 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true)
170 OPENJDK=true
171 endif
172 endif
173
166 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 174 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
167 175
168 BUILDTREE = \ 176 BUILDTREE = \
169 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) 177 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
170 178
193 echo; \ 201 echo; \
194 echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ 202 echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
195 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ 203 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
196 echo; \ 204 echo; \
197 echo "GAMMADIR = $(GAMMADIR)"; \ 205 echo "GAMMADIR = $(GAMMADIR)"; \
206 echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \
207 echo "OSNAME = $(OSNAME)"; \
198 echo "SYSDEFS = \$$(Platform_sysdefs)"; \ 208 echo "SYSDEFS = \$$(Platform_sysdefs)"; \
199 echo "SRCARCH = $(SRCARCH)"; \ 209 echo "SRCARCH = $(SRCARCH)"; \
200 echo "BUILDARCH = $(BUILDARCH)"; \ 210 echo "BUILDARCH = $(BUILDARCH)"; \
201 echo "LIBARCH = $(LIBARCH)"; \ 211 echo "LIBARCH = $(LIBARCH)"; \
202 echo "TARGET = $(TARGET)"; \ 212 echo "TARGET = $(TARGET)"; \
203 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ 213 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \
204 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ 214 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \
205 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 215 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
206 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 216 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
207 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 217 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
218 echo "OPENJDK = $(OPENJDK)"; \
208 echo; \ 219 echo; \
209 echo "# Used for platform dispatching"; \ 220 echo "# Used for platform dispatching"; \
210 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ 221 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
211 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ 222 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \
212 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ 223 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \
249 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ 260 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
250 echo; \ 261 echo; \
251 [ -n "$(SPEC)" ] && \ 262 [ -n "$(SPEC)" ] && \
252 echo "include $(SPEC)"; \ 263 echo "include $(SPEC)"; \
253 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ 264 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
265 echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
254 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ 266 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
255 ) > $@ 267 ) > $@
256 268
257 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst 269 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
258 @echo Creating $@ ... 270 @echo Creating $@ ...