diff options
| author | David Tardon <dtardon@redhat.com> | 2015-05-12 12:10:16 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-05-12 12:14:54 +0200 |
| commit | d8eee8e4d1a303044bf34b28c2e95bd6da23fd79 (patch) | |
| tree | 70d58a31a061a4f243a712745e8348ec612f1645 /jvmfwk | |
| parent | d2ef03ce0b9295034f9078bc04acbf4cfc939ef6 (diff) | |
java dir for powepc64 and powepc64le can differ
E.g., RHEL >= 7.1 uses ppc64le for reasons listed in
https://bugs.openjdk.java.net/browse/JDK-8073139 .
This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51.
Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/inc/vendorbase.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
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" |