diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2006-07-18 23:23:02 +0000 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2006-07-18 23:23:02 +0000 |
commit | 3e2f072bb525e5917fc1aba074abc9fb335fc9b5 (patch) | |
tree | 27cdd078ace17e273e9c7c2672a071d0dc551335 /java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp | |
parent | . Properly deal with error cases in transferTo0(). (diff) |
. On amd64 the plugin should look for the Server VM, since there is no
Client VM.
Submitted by: Kurt Miller <kurt@intricatesoftware.com>
Notes
Notes:
svn path=/head/; revision=168176
Diffstat (limited to 'java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp')
-rw-r--r-- | java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp new file mode 100644 index 000000000000..78d8d258832f --- /dev/null +++ b/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig Tue Oct 19 15:04:42 2004 ++++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp Thu Jul 6 17:09:36 2006 +@@ -305,7 +305,11 @@ + char * jre = m_ltstate->java_dir; + + // ARCH is passed in on the compile line ++#if defined(_ALLBSD_SOURCE) && defined(__amd64__) ++ sprintf(our_ld_paths,"%s/lib/%s/server:%s/lib/%s",jre,ARCH,jre,ARCH); ++#else + sprintf(our_ld_paths,"%s/lib/%s/client:%s/lib/%s",jre,ARCH,jre,ARCH); ++#endif + + char * new_ld_lib_path; + |