diff options
| -rw-r--r-- | jvmfwk/Library_jvmfwk.mk | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 9928b0db7c1b..64a6b9d8e396 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -58,9 +58,11 @@ $(eval $(call gb_Library_add_cxxflags,jvmfwk,\ $(gb_OBJCXXFLAGS) \ )) +ifeq ($(CPUNAME),X86_64) $(eval $(call gb_Library_add_objcxxobjects,jvmfwk,\ jvmfwk/plugins/sunmajor/pluginlib/util_cocoa \ )) +endif $(eval $(call gb_Library_add_libs,jvmfwk,\ -framework Foundation \ diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 77ea93d69592..8b9fd702397e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -72,7 +72,7 @@ #include "sunversion.hxx" #include "diagnostics.h" -#ifdef MACOSX +#if defined MACOSX && defined __x86_64__ #include "util_cocoa.hxx" #endif @@ -625,7 +625,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( return javaPluginError::VmCreationFailed; #endif OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData); -#ifdef MACOSX +#if defined MACOSX && defined __x86_64__ if ( !JvmfwkUtil_isLoadableJVM( sRuntimeLib ) ) return javaPluginError::VmCreationFailed; #endif diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index ce297512482c..6eb96d731c8f 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -47,7 +47,7 @@ #include "sunjre.hxx" #include "vendorlist.hxx" #include "diagnostics.h" -#ifdef MACOSX +#if defined MACOSX && defined __x86_64__ #include "util_cocoa.hxx" #endif @@ -376,8 +376,10 @@ bool getJavaProps(const OUString & exePath, } #ifdef MACOSX +#if defined __x86_64__ if (!JvmfwkUtil_isLoadableJVM(exePath)) return false; +#endif if (sClassPath.endsWith("/")) sClassPath += "../Resources/java/"; else |