hotspot/make/linux/makefiles/vm.make

*** 134,147 ****
          cat $^ > $@
  
  vm.def: $(Res_Files) $(Obj_Files)
          sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
  
! ifeq ($(ZERO_LIBARCH), ppc64)
    STATIC_CXX = false
  else
    STATIC_CXX = true
  endif
  
  ifeq ($(LINK_INTO),AOUT)
    LIBJVM.o                 =
    LIBJVM_MAPFILE           =
--- 134,151 ----
          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
      STATIC_CXX = true
+   endif
  endif
  
  ifeq ($(LINK_INTO),AOUT)
    LIBJVM.o                 =
    LIBJVM_MAPFILE           =
*** 165,174 ****
--- 169,182 ----
    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.c)
  
  # rule for building precompiled header
  $(PRECOMPILED_HEADER): $(Precompiled_Files)