Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2009-04-17 18:11:21 +0000
committerAndrew Niefer2009-04-17 18:11:21 +0000
commit48b67090f67e9cfcb2422a966fbd69fc7692c7be (patch)
tree09df5f259652e1fe6bbb1c410e552d19aa44e69b
parent103f51a46eaaa5a1663b09d6a7de4c5b4bc6a156 (diff)
downloadrt.equinox.framework-48b67090f67e9cfcb2422a966fbd69fc7692c7be.tar.gz
rt.equinox.framework-48b67090f67e9cfcb2422a966fbd69fc7692c7be.tar.xz
rt.equinox.framework-48b67090f67e9cfcb2422a966fbd69fc7692c7be.zip
bug 272209 - solaris x86 launchers
-rw-r--r--bundles/org.eclipse.equinox.executable/contributed/gtk/solaris/x86/readme.txt1
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/build.sh4
-rw-r--r--bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF2
3 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/contributed/gtk/solaris/x86/readme.txt b/bundles/org.eclipse.equinox.executable/contributed/gtk/solaris/x86/readme.txt
deleted file mode 100644
index 32a247d8d..000000000
--- a/bundles/org.eclipse.equinox.executable/contributed/gtk/solaris/x86/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder will hold gtk.solaris.x86 binaries when they are contributed. \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
index 2faefcdb7..0a3b574a9 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
@@ -108,9 +108,11 @@ case $OS in
case ${PROC} in
"i386")
defaultOSArch="x86"
+ CC=gcc
;;
"sparc")
defaultOSArch="sparc"
+ CC=cc
;;
*)
echo "*** Unknown processor type <${PROC}>"
@@ -121,7 +123,7 @@ case $OS in
echo "Unknown OS -- build aborted"
;;
esac
-
+export CC
# Parse the command line arguments and override the default values.
extraArgs=""
while [ "$1" != "" ]; do
diff --git a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
index bc0563abf..be1e9db11 100644
--- a/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=x86))
Bundle-Localization: launcher.gtk.solaris.x86

Back to the top