--- a/hotspot/make/solaris/makefiles/rules.make	Sun Jun 22 20:07:58 2008 -0700
+++ b/hotspot/make/solaris/makefiles/rules.make	Tue Jun 24 16:52:31 2008 -0700
@@ -133,7 +133,10 @@
 COMPILE_DONE    = && { echo Done with $<; }
 endif
 
-include $(GAMMADIR)/make/defs.make
+# Include NONPIC_OBJ_FILES definition
+ifndef LP64
+include $(GAMMADIR)/make/pic.make
+endif
 
 # Sun compiler for 64 bit Solaris does not support building non-PIC object files.
 ifdef LP64