diff options
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/gtk/build.sh')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/gtk/build.sh | 12 |
1 files changed, 10 insertions, 2 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" |