Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2020-08-19 05:26:55 -0400
committerSravan Kumar Lakkimsetti2020-08-19 05:26:55 -0400
commit02552e059ba37c673e9ba01c99e50eec3a3641cb (patch)
treeda1a0aa6527447800a0217cb347783380e5ab898
parentae9290b9b17561c858e394357750653804b89b06 (diff)
downloadrt.equinox.framework-02552e059ba37c673e9ba01c99e50eec3a3641cb.tar.gz
rt.equinox.framework-02552e059ba37c673e9ba01c99e50eec3a3641cb.tar.xz
rt.equinox.framework-02552e059ba37c673e9ba01c99e50eec3a3641cb.zip
Bug 565913 - Eclipse fails to launch on MacOs Big Sur
Change-Id: I17a98703f06162251d60d573832ff23831d55721 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c
index 64dc3f1fc..cc8e9c100 100644
--- a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c
@@ -426,7 +426,8 @@ char * findVMLibrary( char* command ) {
}
}
cmd = command;
- if (strstr(cmd, "/JavaVM.framework/") != NULL && (strstr(cmd, "/Current/") != NULL || strstr(cmd, "/A/") != NULL)) {
+ if ((strstr(cmd, "/JavaVM.framework/") != NULL && (strstr(cmd, "/Current/") != NULL)) || strstr(cmd, "/A/") != NULL || strstr(cmd, "/usr/bin/java") != NULL ) {
+ //On Mac we have universal library at /usr/bin/java. But actual java is some where else. So if the path received is default path we need look for java home
cmd = getJavaHome();
if (cmd == NULL) {
return NULL;

Back to the top