diff options
| -rw-r--r-- | config_host/config_java.h.in | 6 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | jvmfwk/inc/vendorbase.hxx | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/config_host/config_java.h.in b/config_host/config_java.h.in new file mode 100644 index 000000000000..8b23de922488 --- /dev/null +++ b/config_host/config_java.h.in @@ -0,0 +1,6 @@ +#ifndef CONFIG_JAVA_H +#define CONFIG_JAVA_H + +#undef JAVA_ARCH + +#endif diff --git a/configure.ac b/configure.ac index 55157a9e1ae2..541475429da3 100644 --- a/configure.ac +++ b/configure.ac @@ -7002,6 +7002,7 @@ then ;; powerpc64le) AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) + JAVA_ARCH=$my_java_arch ;; x86_64) my_java_arch=amd64 @@ -7011,6 +7012,7 @@ then ;; esac JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt" + AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])]) fi AC_MSG_RESULT([$JAWTLIB]) fi @@ -12988,6 +12990,7 @@ AC_CONFIG_HEADERS([config_host/config_folders.h]) AC_CONFIG_HEADERS([config_host/config_gcc.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) +AC_CONFIG_HEADERS([config_host/config_java.h]) AC_CONFIG_HEADERS([config_host/config_lgpl.h]) AC_CONFIG_HEADERS([config_host/config_liblangtag.h]) AC_CONFIG_HEADERS([config_host/config_locales.h]) diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index 2ecd01ff710e..a01db566c4c1 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX +#include "config_java.h" + #include "rtl/ustring.hxx" #include "rtl/ref.hxx" #include "osl/endian.h" @@ -31,7 +33,9 @@ namespace jfw_plugin //Used by subclasses of VendorBase to build paths to Java runtime -#if defined(__sparcv9) +#if defined(JAVA_ARCH) +#define JFW_PLUGIN_ARCH JAVA_ARCH +#elif defined(__sparcv9) #define JFW_PLUGIN_ARCH "sparcv9" #elif defined SPARC #define JFW_PLUGIN_ARCH "sparc" |