comparison make/linux/makefiles/buildtree.make @ 5946:3d7ea1dbe0de

7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built Reviewed-by: dholmes, ohair
author erikj
date Mon, 19 Mar 2012 10:09:24 +0100
parents 7292cff45988
children 74c359c4a9e5
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
64 QUIETLY$(MAKE_VERBOSE) = @ 64 QUIETLY$(MAKE_VERBOSE) = @
65 65
66 # For now, until the compiler is less wobbly: 66 # For now, until the compiler is less wobbly:
67 TESTFLAGS = -Xbatch -showversion 67 TESTFLAGS = -Xbatch -showversion
68 68
69 ifeq ($(ZERO_BUILD), true) 69 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
70 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero 70 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
71 else 71 else
72 ifdef USE_SUNCC 72 ifdef USE_SUNCC
73 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc 73 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
74 else 74 else