diff options
| author | Silenio Quarti | 2013-06-26 14:45:17 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2013-06-26 14:45:50 +0000 |
| commit | 2f4d8303f1f56891e0f61a613be3f67edc031ba3 (patch) | |
| tree | 11037f59b2be363bae059b58acfe1a8641bcf0f9 /bundles/org.eclipse.equinox.executable/library | |
| parent | bcec7c003442e38dd5160ff5ed394159eebeb89a (diff) | |
| download | rt.equinox.framework-2f4d8303f1f56891e0f61a613be3f67edc031ba3.tar.gz rt.equinox.framework-2f4d8303f1f56891e0f61a613be3f67edc031ba3.tar.xz rt.equinox.framework-2f4d8303f1f56891e0f61a613be3f67edc031ba3.zip | |
Bug 409033 - Mac OS X: fix for bug 302584 broke ability to specify arbitrary Java VM using -vm parameter
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c | 17 |
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 25fa99a57..68ba06770 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. */ |