diff options
| author | Arun Thondapu | 2016-03-30 08:49:34 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2016-03-30 08:49:56 +0000 |
| commit | fbf4e7bbb85949f0cc7f759254baae0f9b6449c3 (patch) | |
| tree | 43d8f11a1df8727c2d7590a51101d9e207b2b55b /features/org.eclipse.equinox.executable.feature/library/gtk | |
| parent | 1b7bd98d0c6b8334fa838e7d1c875b24c58c1384 (diff) | |
| download | rt.equinox.framework-fbf4e7bbb85949f0cc7f759254baae0f9b6449c3.tar.gz rt.equinox.framework-fbf4e7bbb85949f0cc7f759254baae0f9b6449c3.tar.xz rt.equinox.framework-fbf4e7bbb85949f0cc7f759254baae0f9b6449c3.zip | |
Bug 429335 - Need 64-bit launcher for Solaris/X86_64I20160330-0930
Change-Id: Ia15b66b2ac38b55b6d931f11a88c6308209ce514
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/gtk')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/gtk/build.sh | 12 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak | 7 |
2 files changed, 14 insertions, 5 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh index 7ab22c555..7d81a3576 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -176,8 +176,13 @@ case $defaultOS in fi case ${PROC} in "i386" | "x86") - defaultOSArch="x86" - [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14" + if [ "`isainfo -k`" = "amd64" ]; then + defaultOSArch="x86_64" + [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71" + else + defaultOSArch="x86" + [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14" + fi CC=cc ;; "sparc") @@ -236,6 +241,9 @@ elif [ "$defaultOSArch" = "ia64" ]; then elif [ "$defaultOSArch" = "x86" ]; then M_ARCH=-m32 export M_ARCH +elif [ "$defaultOS" = "solaris" -a "$defaultOSArch" = "x86_64" ]; then + M_ARCH=-m64 + export M_ARCH fi LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak index 945becf9e..4d41b5f65 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak @@ -47,8 +47,9 @@ GTK_LIBS = \ -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \ -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.4\"" -LFLAGS = -G -CFLAGS = $(OPTFLAG) \ +LFLAGS = ${M_ARCH} -G +CFLAGS = ${M_ARCH} \ + $(OPTFLAG) \ -DSOLARIS \ $(PICFLAG) \ -DMOZILLA_FIX \ @@ -97,7 +98,7 @@ eclipseNix.o: ../eclipseNix.c $(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) - $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) + $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) |