comparison make/solaris/Makefile @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 989155e2d07a 8b46b0196eb0
children b9a918201d47
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
1 # 1 #
2 # Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1998, 2013, 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.
155 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs 155 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
156 SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS)) 156 SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
157 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS)) 157 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
158 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS)) 158 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
159 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS)) 159 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
160 SUBDIRS_KERNEL = $(addprefix $(OSNAME)_$(BUILDARCH)_kernel/,$(TARGETS))
161 SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS)) 160 SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS))
162 161
163 TARGETS_C2 = $(TARGETS) 162 TARGETS_C2 = $(TARGETS)
164 TARGETS_C1 = $(addsuffix 1,$(TARGETS)) 163 TARGETS_C1 = $(addsuffix 1,$(TARGETS))
165 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS)) 164 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
166 TARGETS_CORE = $(addsuffix core,$(TARGETS)) 165 TARGETS_CORE = $(addsuffix core,$(TARGETS))
167 TARGETS_KERNEL = $(addsuffix kernel,$(TARGETS))
168 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS)) 166 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS))
169 167
170 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make 168 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
171 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 169 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
172 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 170 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
230 228
231 $(SUBDIRS_CORE): $(BUILDTREE_MAKE) 229 $(SUBDIRS_CORE): $(BUILDTREE_MAKE)
232 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 230 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
233 $(BUILDTREE) VARIANT=core 231 $(BUILDTREE) VARIANT=core
234 232
235 $(SUBDIRS_KERNEL): $(BUILDTREE_MAKE)
236 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
237 $(BUILDTREE) VARIANT=kernel
238
239 $(SUBDIRS_GRAAL): $(BUILDTREE_MAKE) 233 $(SUBDIRS_GRAAL): $(BUILDTREE_MAKE)
240 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 234 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
241 $(BUILDTREE) VARIANT=graal 235 $(BUILDTREE) VARIANT=graal
242 236
243 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 237 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
276 endif 270 endif
277 ifdef INSTALL 271 ifdef INSTALL
278 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 272 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
279 endif 273 endif
280 274
281 $(TARGETS_KERNEL): $(SUBDIRS_KERNEL)
282 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS)
283 ifeq ($(TEST_IN_BUILD),true)
284 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && ./test_gamma
285 endif
286 ifdef INSTALL
287 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) install
288 endif
289
290 $(TARGETS_GRAAL): $(SUBDIRS_GRAAL) 275 $(TARGETS_GRAAL): $(SUBDIRS_GRAAL)
291 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) 276 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS)
292 ifdef INSTALL 277 ifdef INSTALL
293 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) install 278 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) install
294 endif 279 endif
295 280
296 # Just build the tree, and nothing else: 281 # Just build the tree, and nothing else:
297 tree: $(SUBDIRS_C2) 282 tree: $(SUBDIRS_C2)
298 tree1: $(SUBDIRS_C1) 283 tree1: $(SUBDIRS_C1)
299 treecore: $(SUBDIRS_CORE) 284 treecore: $(SUBDIRS_CORE)
300 treekernel: $(SUBDIRS_KERNEL)
301 treegraal: $(SUBDIRS_GRAAL) 285 treegraal: $(SUBDIRS_GRAAL)
302 286
303 # Doc target. This is the same for all build options. 287 # Doc target. This is the same for all build options.
304 # Hence create a docs directory beside ...$(ARCH)_[...] 288 # Hence create a docs directory beside ...$(ARCH)_[...]
305 # We specify 'BUILD_FLAVOR=product' so that the proper 289 # We specify 'BUILD_FLAVOR=product' so that the proper
316 core: jvmgcore productcore 300 core: jvmgcore productcore
317 301
318 clean_docs: 302 clean_docs:
319 rm -rf $(SUBDIR_DOCS) 303 rm -rf $(SUBDIR_DOCS)
320 304
321 clean_compiler1 clean_compiler2 clean_core clean_kernel clean_graal: 305 clean_compiler1 clean_compiler2 clean_core clean_graal:
322 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@) 306 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
323 307
324 clean: clean_compiler2 clean_compiler1 clean_core clean_docs clean_kernel clean_graal 308 clean: clean_compiler2 clean_compiler1 clean_core clean_docs clean_graal
325 309
326 include $(GAMMADIR)/make/cscope.make 310 include $(GAMMADIR)/make/cscope.make
327 311
328 #------------------------------------------------------------------------------- 312 #-------------------------------------------------------------------------------
329 313