diff --git a/Makefile.common b/Makefile.common
index 029c2c987a5..ba24c10dc64 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -139,11 +139,6 @@ endif
 LinkG    := $(Link) -g  -L $(LIBDEBUG)
 LinkO    := $(Link) -O3 -L $(LIBRELEASE)
 
-# Create a .so file from a .o files...
-#MakeSO   := $(CXX) -shared $(PROFILE)
-MakeSO   := $(CXX) -G $(PROFILE)
-MakeSOO  := $(MakeSO) -O3
-
 # Create one .o file from a bunch of .o files...
 Relink = ld -r
 
@@ -199,6 +194,23 @@ endif
 
 ifdef LIBRARYNAME
 
+# Figure out how to make a .so file on this platform.  This is really gross and
+# should be autoconfiscated (automake actually), but should hopefully work on
+# linux and solaris.
+#
+
+# Create a .so file from a .o files...
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), SunOS)
+MakeSO   := $(CXX) -G $(PROFILE)
+else
+MakeSO   := $(CXX) -shared $(PROFILE)
+endif
+
+MakeSOO  := $(MakeSO) -O3
+
+
 LIBNAME_O    := $(LIBRELEASE)/lib$(LIBRARYNAME).so
 LIBNAME_G    := $(LIBDEBUG)/lib$(LIBRARYNAME).so
 LIBNAME_AO   := $(LIBRELEASE)/lib$(LIBRARYNAME).a
diff --git a/Makefile.rules b/Makefile.rules
index 029c2c987a5..ba24c10dc64 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -139,11 +139,6 @@ endif
 LinkG    := $(Link) -g  -L $(LIBDEBUG)
 LinkO    := $(Link) -O3 -L $(LIBRELEASE)
 
-# Create a .so file from a .o files...
-#MakeSO   := $(CXX) -shared $(PROFILE)
-MakeSO   := $(CXX) -G $(PROFILE)
-MakeSOO  := $(MakeSO) -O3
-
 # Create one .o file from a bunch of .o files...
 Relink = ld -r
 
@@ -199,6 +194,23 @@ endif
 
 ifdef LIBRARYNAME
 
+# Figure out how to make a .so file on this platform.  This is really gross and
+# should be autoconfiscated (automake actually), but should hopefully work on
+# linux and solaris.
+#
+
+# Create a .so file from a .o files...
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), SunOS)
+MakeSO   := $(CXX) -G $(PROFILE)
+else
+MakeSO   := $(CXX) -shared $(PROFILE)
+endif
+
+MakeSOO  := $(MakeSO) -O3
+
+
 LIBNAME_O    := $(LIBRELEASE)/lib$(LIBRARYNAME).so
 LIBNAME_G    := $(LIBDEBUG)/lib$(LIBRARYNAME).so
 LIBNAME_AO   := $(LIBRELEASE)/lib$(LIBRARYNAME).a