--- patches/icedtea-shark-build.patch.orig 2008-07-28 17:27:21.000000000 +0200 +++ patches/icedtea-shark-build.patch 2008-07-28 17:28:03.000000000 +0200 @@ -137,37 +137,6 @@ Include_DBs = $(Include_DBs/$(TYPE)) Cached_plat = $(GENERATED)/platform.current -diff -r 8e41d25d7665 openjdk/hotspot/build/linux/makefiles/vm.make ---- openjdk/hotspot/build/linux/makefiles/vm.make Fri Jun 20 13:26:10 2008 +0100 -+++ openjdk/hotspot/build/linux/makefiles/vm.make Fri Jun 20 13:26:20 2008 +0100 -@@ -149,10 +149,14 @@ mapfile_reorder : mapfile $(REORDERFILE) - rm -f $@ - cat $^ > $@ - --ifeq ($(ZERO_LIBARCH), ppc64) -+ifdef ICEDTEA_SHARK_BUILD - STATIC_CXX = false - else -- STATIC_CXX = true -+ ifeq ($(ZERO_LIBARCH), ppc64) -+ STATIC_CXX = false -+ else -+ STATIC_CXX = true -+ endif - endif - - ifeq ($(LINK_INTO),AOUT) -@@ -179,6 +183,10 @@ endif - endif - ifdef ICEDTEA_ZERO_BUILD - LIBS_VM += $(LIBFFI_LIBS) -+endif -+ifdef ICEDTEA_SHARK_BUILD -+LFLAGS_VM += $(LLVM_LDFLAGS) -+LIBS_VM += $(LLVM_LIBS) - endif - - LINK_VM = $(LINK_LIB.c) diff -r 8e41d25d7665 openjdk/hotspot/make/Makefile --- openjdk/hotspot/make/Makefile Fri Jun 20 13:26:10 2008 +0100 +++ openjdk/hotspot/make/Makefile Fri Jun 20 13:30:28 2008 +0100 @@ -274,3 +243,35 @@ endif # ICEDTEA_CORE_BUILD +--- openjdk/hotspot/build/linux/makefiles/vm.make.orig 2008-07-28 17:18:47.000000000 +0200 ++++ openjdk/hotspot/build/linux/makefiles/vm.make 2008-07-28 17:25:59.000000000 +0200 +@@ -149,10 +149,14 @@ + rm -f $@ + cat $^ > $@ + +-ifeq ($(ZERO_LIBARCH), ppc64) +- STATIC_CXX = false +-else +- STATIC_CXX = false ++ifdef ICEDTEA_SHARK_BUILD ++ STATIC_CXX = false ++ else ++ ifeq ($(ZERO_LIBARCH), ppc64) ++ STATIC_CXX = false ++ else ++ STATIC_CXX = true ++ endif + endif + + ifeq ($(LINK_INTO),AOUT) +@@ -180,6 +184,10 @@ + ifdef ICEDTEA_ZERO_BUILD + LIBS_VM += $(LIBFFI_LIBS) + endif ++ifdef ICEDTEA_SHARK_BUILD ++LFLAGS_VM += $(LLVM_LDFLAGS) ++LIBS_VM += $(LLVM_LIBS) ++endif + + LINK_VM = $(LINK_LIB.cpp) +
