diff make/bsd/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 75982791ddb6 fb19af007ffc
line wrap: on
line diff
--- a/make/bsd/makefiles/buildtree.make	Mon Mar 19 20:13:17 2012 +0100
+++ b/make/bsd/makefiles/buildtree.make	Mon Mar 19 10:09:24 2012 +0100
@@ -69,7 +69,7 @@
 # For now, until the compiler is less wobbly:
 TESTFLAGS	= -Xbatch -showversion
 
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
   PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
 else
   ifdef USE_SUNCC