diff options
| author | Arun Thondapu | 2016-05-11 12:32:57 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2016-05-19 17:31:35 +0000 |
| commit | 7e2c80cd243eb1d25c31b1802eafe88e082be174 (patch) | |
| tree | 90ac91226eecba871acc839756c4148a47d717f2 /features/org.eclipse.equinox.executable.feature/library/gtk/build.sh | |
| parent | 30bf5c3cfa5ceeed1b1787841e1b91351aa8d483 (diff) | |
| download | rt.equinox.framework-7e2c80cd243eb1d25c31b1802eafe88e082be174.tar.gz rt.equinox.framework-7e2c80cd243eb1d25c31b1802eafe88e082be174.tar.xz rt.equinox.framework-7e2c80cd243eb1d25c31b1802eafe88e082be174.zip | |
Bug 491519 - Need 64-bit launcher for Solaris/SPARCI20160521-1500I20160520-2000I20160519-1730
Change-Id: Id75d6db2a397e8e8da9a3fc5648bdff6199bb83c
Signed-off-by: Arun Thondapu <arunkumar.thondapu@in.ibm.com>
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 | 17 |
1 files changed, 12 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 7d81a3576..ea47968a1 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -186,8 +186,13 @@ case $defaultOS in CC=cc ;; "sparc") - defaultOSArch="sparc" - [ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14" + if [ "`isainfo -k`" = "sparcv9" ]; then + defaultOSArch="sparcv9" + [ -d /bluebird/teamswt/swt-builddir/JDKs/SOLARIS/SPARC64/jdk1.5.0_22 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/SOLARIS/SPARC64/jdk1.5.0_22" + else + defaultOSArch="sparc" + [ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14" + fi CC=cc ;; *) @@ -241,9 +246,11 @@ 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 +elif [ "$defaultOS" = "solaris" ]; then + if [ "$defaultOSArch" = "x86_64" -o "$defaultOSArch" = "sparcv9" ]; then + M_ARCH=-m64 + export M_ARCH + fi fi LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" |