diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-11 18:36:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-12 08:12:53 +0100 |
| commit | 237d2c923b77479dbdf07db7bd926c45b01b8fc8 (patch) | |
| tree | 782952de2b07e0baee40fe97d55ac89b140a5e87 /jvmfwk | |
| parent | b4668f2c48db7fc6df2e7914f683b26f419cd9ae (diff) | |
Don't set JAVA_HOME on Mac OS X
...for one, it doesn't appear necessary there ("needed for awt"), and for
another setting it according to Oracle's JRE 7 would prevent a subsequent
visit to the Advanced preferences pane from listing Apple's JRE 6, as launching
that java and reading its system properties would be fooled by the JAVA_HOME and
report the Oracle system properties instead.
Change-Id: I02d82de6113b44b3cae3fb55cd83177fe852d769
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index a7ee90a29cc2..0069aec74251 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -595,7 +595,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( return JFW_PLUGIN_E_VM_CREATION_FAILED; } -#ifdef UNX +#if defined UNX && !defined MACOSX //Setting the JAVA_HOME is needed for awt OUString javaHome("JAVA_HOME="); OUString sPathLocation; |