diff options
| author | Thomas Watson | 2016-03-30 15:57:23 +0000 |
|---|---|---|
| committer | Thomas Watson | 2016-03-30 15:57:23 +0000 |
| commit | 16785826eacbec5b188ae385374ae16a6a995bc1 (patch) | |
| tree | 5e91fad8d6f1ee14e066648cfe3b595498c172a2 /features/org.eclipse.equinox.executable.feature/library/gtk/build.sh | |
| parent | fbf4e7bbb85949f0cc7f759254baae0f9b6449c3 (diff) | |
| download | rt.equinox.framework-16785826eacbec5b188ae385374ae16a6a995bc1.tar.gz rt.equinox.framework-16785826eacbec5b188ae385374ae16a6a995bc1.tar.xz rt.equinox.framework-16785826eacbec5b188ae385374ae16a6a995bc1.zip | |
Revert "Bug 429335 - Need 64-bit launcher for Solaris/X86_64"I20160330-1230
This reverts commit fbf4e7bbb85949f0cc7f759254baae0f9b6449c3.
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, 2 insertions, 10 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 7d81a3576..7ab22c555 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -176,13 +176,8 @@ case $defaultOS in fi case ${PROC} in "i386" | "x86") - 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 + 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" CC=cc ;; "sparc") @@ -241,9 +236,6 @@ 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" |