1.1 --- a/make/linux/makefiles/vm.make Mon Mar 19 20:13:17 2012 +0100
1.2 +++ b/make/linux/makefiles/vm.make Mon Mar 19 10:09:24 2012 +0100
1.3 @@ -42,7 +42,7 @@
1.4 -include $(DEP_DIR)/*.d
1.5
1.6 # read machine-specific adjustments (%%% should do this via buildtree.make?)
1.7 -ifeq ($(ZERO_BUILD), true)
1.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
1.9 include $(MAKEFILES_DIR)/zeroshark.make
1.10 else
1.11 include $(MAKEFILES_DIR)/$(BUILDARCH).make
1.12 @@ -236,7 +236,7 @@
1.13 vm.def: $(Res_Files) $(Obj_Files)
1.14 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
1.15
1.16 -ifeq ($(SHARK_BUILD), true)
1.17 +ifeq ($(JVM_VARIANT_ZEROSHARK), true)
1.18 STATIC_CXX = false
1.19 else
1.20 ifeq ($(ZERO_LIBARCH), ppc64)
1.21 @@ -268,12 +268,12 @@
1.22
1.23 LIBS_VM += $(LIBS)
1.24 endif
1.25 -ifeq ($(ZERO_BUILD), true)
1.26 +ifeq ($(JVM_VARIANT_ZERO), true)
1.27 LIBS_VM += $(LIBFFI_LIBS)
1.28 endif
1.29 -ifeq ($(SHARK_BUILD), true)
1.30 +ifeq ($(JVM_VARIANT_ZEROSHARK), true)
1.31 + LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
1.32 LFLAGS_VM += $(LLVM_LDFLAGS)
1.33 - LIBS_VM += $(LLVM_LIBS)
1.34 endif
1.35
1.36 LINK_VM = $(LINK_LIB.CC)
