aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2013-06-26 10:45:17 (EDT)
committerSilenio Quarti2013-11-20 11:10:09 (EST)
commit0b19db18fb59f986b015ce1e2b2f2745cb823a9d (patch)
treecfa9b4221d7aaa1c3c43755f4e0b53e89f875b53
parentcfd1cff1fe6d047faa50bbb29b47026b9b4a5b06 (diff)
downloadrt.equinox.framework-0b19db18fb59f986b015ce1e2b2f2745cb823a9d.zip
rt.equinox.framework-0b19db18fb59f986b015ce1e2b2f2745cb823a9d.tar.gz
rt.equinox.framework-0b19db18fb59f986b015ce1e2b2f2745cb823a9d.tar.bz2
Bug 409033 - Mac OS X: fix for bug 302584 broke ability to specify arbitrary Java VM using -vm parameter
-rw-r--r--bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
index 25fa99a..68ba067 100644
--- a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
+++ b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
@@ -69,12 +69,17 @@ static char * findLib(char * command);
#define MAX_LOCATION_LENGTH 40 /* none of the jvmLocations strings should be longer than this */
#define MAX_JVMLIB_LENGTH 15 /* none of the jvmLibs strings should be longer than this */
-static const char* jvmLocations[] = { "../lib/" JAVA_ARCH "/client",
- "../lib/" JAVA_ARCH "/server",
- "../jre/lib/" JAVA_ARCH "/client",
- "../jre/lib/" JAVA_ARCH "/server",
- "../jre/lib/client",
- "../jre/lib/server", NULL };
+static const char* jvmLocations[] = {
+ "../lib/" JAVA_ARCH "/client",
+ "../lib/" JAVA_ARCH "/server",
+ "../lib/client",
+ "../lib/server",
+ "../jre/lib/" JAVA_ARCH "/client",
+ "../jre/lib/" JAVA_ARCH "/server",
+ "../jre/lib/client",
+ "../jre/lib/server",
+ NULL
+};
static const char* jvmLibs[] = { "libjvm.dylib", "libjvm.jnilib", "libjvm.so", NULL };
/* Define the window system arguments for the various Java VMs. */