diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-11 18:36:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-12 10:52:16 +0000 |
| commit | 09749c7751e4c12a898f0c2f98b0c71ebe67ba6d (patch) | |
| tree | c90f9650028177ab4115f9834ef2ef34b0e70df2 | |
| parent | 7885d938cb425df7b759c0a42871870921394eb6 (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
(cherry picked from commit 237d2c923b77479dbdf07db7bd926c45b01b8fc8)
Reviewed-on: https://gerrit.libreoffice.org/8005
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -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 981b8278385f..a3449c3e7a2f 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -588,7 +588,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; |