comparison make/bsd/Makefile @ 4988:eb5b24d1499f

Merge
author Christian Haeubl <christian.haeubl@oracle.com>
date Mon, 27 Feb 2012 15:06:36 -0800
parents 33df1aeaebbf
children 957c266d8bc5
comparison
equal deleted inserted replaced
4987:f292f9c590ba 4988:eb5b24d1499f
208 TARGETS_ZERO = $(addsuffix zero,$(TARGETS)) 208 TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
209 TARGETS_SHARK = $(addsuffix shark,$(TARGETS)) 209 TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
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) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX)
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 215
216 BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) 216 BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
217 217
218 #------------------------------------------------------------------------------- 218 #-------------------------------------------------------------------------------