Merge branch 'solaris'

* solaris: Add shared compile option for sun compiler
mislav · Mar 3, 2009 · 9d78167 · 9d78167
2 parents 3f25d47 + c528f33
commit 9d78167
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/ext/extconf.rb b/ext/extconf.rb
@@ -49,15 +49,16 @@ def add_define(name)
 
   add_define 'OS_SOLARIS8'
 
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-
   # Patch by Tim Pease, fixes SUNWspro compile problems.
   if CONFIG['CC'] == 'cc'
-    $CFLAGS = CONFIG['CFLAGS'] = "-g -O2 -fPIC"
+    # SUN CHAIN
+    $CFLAGS = CONFIG['CFLAGS'] = "-g -O2 -fPIC -G"
     CONFIG['CCDLFLAGS'] = "-fPIC"
+  else
+    # GNU CHAIN
+    # on Unix we need a g++ link, not gcc.
+    CONFIG['LDSHARED'] = "$(CXX) -shared"
   end
-
 when /openbsd/
   # OpenBSD branch contributed by Guillaume Sellier.
 

diff --git a/ext/fastfilereader/extconf.rb b/ext/fastfilereader/extconf.rb
@@ -49,8 +49,16 @@ def add_define(name)
 
   add_define 'OS_SOLARIS8'
 
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
+  # Patch by Tim Pease, fixes SUNWspro compile problems.
+  if CONFIG['CC'] == 'cc'
+    # SUN CHAIN
+    $CFLAGS = CONFIG['CFLAGS'] = "-g -O2 -fPIC -G"
+    CONFIG['CCDLFLAGS'] = "-fPIC"
+  else
+    # GNU CHAIN
+    # on Unix we need a g++ link, not gcc.
+    CONFIG['LDSHARED'] = "$(CXX) -shared"
+  end
 when /openbsd/
   # OpenBSD branch contributed by Guillaume Sellier.