make/linux/makefiles/vm.make

*** 40,50 ****
  
  # reads the generated files defining the set of .o's and the .o .h dependencies
  -include $(DEP_DIR)/*.d
  
  # read machine-specific adjustments (%%% should do this via buildtree.make?)
! ifeq ($(ZERO_BUILD), true)
    include $(MAKEFILES_DIR)/zeroshark.make
  else
    include $(MAKEFILES_DIR)/$(BUILDARCH).make
  endif
  
--- 40,50 ----
  
  # reads the generated files defining the set of .o's and the .o .h dependencies
  -include $(DEP_DIR)/*.d
  
  # read machine-specific adjustments (%%% should do this via buildtree.make?)
! ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    include $(MAKEFILES_DIR)/zeroshark.make
  else
    include $(MAKEFILES_DIR)/$(BUILDARCH).make
  endif
  
*** 234,244 ****
          cat $^ > $@
  
  vm.def: $(Res_Files) $(Obj_Files)
          sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
  
! ifeq ($(SHARK_BUILD), true)
    STATIC_CXX = false
  else
    ifeq ($(ZERO_LIBARCH), ppc64)
      STATIC_CXX = false
    else
--- 234,244 ----
          cat $^ > $@
  
  vm.def: $(Res_Files) $(Obj_Files)
          sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
  
! ifeq ($(JVM_VARIANT_ZEROSHARK), true)
    STATIC_CXX = false
  else
    ifeq ($(ZERO_LIBARCH), ppc64)
      STATIC_CXX = false
    else
*** 266,281 ****
      LIBS_VM                += -lstdc++
    endif
  
    LIBS_VM                  += $(LIBS)
  endif
! ifeq ($(ZERO_BUILD), true)
    LIBS_VM += $(LIBFFI_LIBS)
  endif
! ifeq ($(SHARK_BUILD), true)
    LFLAGS_VM += $(LLVM_LDFLAGS)
-   LIBS_VM   += $(LLVM_LIBS)
  endif
  
  LINK_VM = $(LINK_LIB.CC)
  
  # rule for building precompiled header
--- 266,281 ----
      LIBS_VM                += -lstdc++
    endif
  
    LIBS_VM                  += $(LIBS)
  endif
! ifeq ($(JVM_VARIANT_ZERO), true)
    LIBS_VM += $(LIBFFI_LIBS)
  endif
! ifeq ($(JVM_VARIANT_ZEROSHARK), true)
!   LIBS_VM   += $(LIBFFI_LIBS) $(LLVM_LIBS)
    LFLAGS_VM += $(LLVM_LDFLAGS)
  endif
  
  LINK_VM = $(LINK_LIB.CC)
  
  # rule for building precompiled header