diff options
3 files changed, 10 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseNix.c b/bundles/org.eclipse.equinox.executable/library/eclipseNix.c index 1e9b97ea5..c18b377c0 100644 --- a/bundles/org.eclipse.equinox.executable/library/eclipseNix.c +++ b/bundles/org.eclipse.equinox.executable/library/eclipseNix.c @@ -35,6 +35,12 @@ #define JAVA_ARCH DEFAULT_OS_ARCH #endif +#ifdef AIX +#define LIB_PATH_VAR _T_ECLIPSE("LIBPATH") +#else +#define LIB_PATH_VAR _T_ECLIPSE("LD_LIBRARY_PATH") +#endif + #define MAX_LOCATION_LENGTH 40 /* none of the jvmLocations strings should be longer than this */ static const char* jvmLocations [] = { "j9vm", "../jre/bin/j9vm", "classic", "../jre/bin/classic", @@ -120,7 +126,7 @@ static void adjustLibraryPath( char * vmLibrary ) { paths = getVMLibrarySearchPath(vmLibrary); - ldPath = (char*)getenv(_T_ECLIPSE("LD_LIBRARY_PATH")); + ldPath = (char*)getenv(LIB_PATH_VAR); if (!ldPath) { ldPath = _T_ECLIPSE(""); needAdjust = 1; @@ -140,7 +146,7 @@ static void adjustLibraryPath( char * vmLibrary ) { newPath = malloc((_tcslen(c) + length + 1) * sizeof(_TCHAR)); _stprintf(newPath, _T_ECLIPSE("%s%s"), c, ldPath); - setenv( "LD_LIBRARY_PATH", newPath, 1); + setenv( LIB_PATH_VAR, newPath, 1); free(newPath); free(c); diff --git a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c index d962b6a4f..ea9d8011a 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c +++ b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c @@ -285,6 +285,7 @@ int launchJavaVM( char* args[] ) fixEnvForMozilla(); #endif /* MOZILLA_FIX */ +#ifdef LINUX { /* put the root of eclipse on the LD_LIBRARY_PATH */ char * ldPath = (char*)getenv(_T_ECLIPSE("LD_LIBRARY_PATH")); @@ -296,6 +297,7 @@ int launchJavaVM( char* args[] ) free(newPath); } } +#endif /* Create a child process for the JVM. */ jvmProcess = fork(); diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak index 4ec36125f..446bfe53e 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak +++ b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak @@ -37,7 +37,6 @@ EXEC = $(PROGRAM_OUTPUT) DLL = $(PROGRAM_LIBRARY) LIBS = -L$(MOTIF_HOME)/lib -ldl -lXm -lXt -lX11 MOTIF_LIBS = -DXM_LIB="\"libXm.a(shr_32.o)\"" -DXT_LIB="\"libXt.a(shr4.o)\"" -DX11_LIB="\"libX11.a(shr4.o)\"" -#MOTIF_LIBS = -DXM_LIB="NULL" -DXT_LIB="NULL" -DX11_LIB="NULL" LFLAGS = -G -bnoentry -bexpall -lm -lc_r -lC_r CFLAGS = -O -s \ -DMOTIF \ @@ -46,7 +45,6 @@ CFLAGS = -O -s \ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ -DDEFAULT_WS="\"$(DEFAULT_WS)\"" \ $(MOTIF_LIBS) \ - -DDEFAULT_JAVA_EXEC \ -DAIX \ -I./ \ -I../ \ |