1.1 --- a/make/linux/makefiles/vm.make Wed Aug 11 01:17:27 2010 -0700
1.2 +++ b/make/linux/makefiles/vm.make Wed Aug 11 05:51:21 2010 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -137,10 +137,14 @@
1.11 vm.def: $(Res_Files) $(Obj_Files)
1.12 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
1.13
1.14 -ifeq ($(ZERO_LIBARCH), ppc64)
1.15 +ifeq ($(SHARK_BUILD), true)
1.16 STATIC_CXX = false
1.17 else
1.18 - STATIC_CXX = true
1.19 + ifeq ($(ZERO_LIBARCH), ppc64)
1.20 + STATIC_CXX = false
1.21 + else
1.22 + STATIC_CXX = true
1.23 + endif
1.24 endif
1.25
1.26 ifeq ($(LINK_INTO),AOUT)
1.27 @@ -168,6 +172,10 @@
1.28 ifeq ($(ZERO_BUILD), true)
1.29 LIBS_VM += $(LIBFFI_LIBS)
1.30 endif
1.31 +ifeq ($(SHARK_BUILD), true)
1.32 + LFLAGS_VM += $(LLVM_LDFLAGS)
1.33 + LIBS_VM += $(LLVM_LIBS)
1.34 +endif
1.35
1.36 LINK_VM = $(LINK_LIB.c)
1.37
