Mercurial > hg > truffle

comparison make/linux/Makefile @ 4137:04b9a2566eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents 50a1d38cd7ac da0999c4b733
children 957c266d8bc5
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
210 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS)) 210 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS))
211 211
212 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make 212 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
213 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 213 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
214 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 214 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
215 BUILDTREE_VARS += OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY)
215 216
216 BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) 217 BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
217 218
218 #------------------------------------------------------------------------------- 219 #-------------------------------------------------------------------------------
219 220
231 232
232 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x, 233 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
233 # Solaris 2.5.1, 2.6). 234 # Solaris 2.5.1, 2.6).
234 # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. 235 # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
235 236
236 SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3.0% 237 SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
237 OS_VERSION := $(shell uname -r) 238 OS_VERSION := $(shell uname -r)
238 EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) 239 EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
239 240
240 check_os_version: 241 check_os_version:
241 ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),) 242 ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),)