--- a/private.rc	Thu Nov 07 12:34:01 1996 +0100
+++ b/private.rc	Thu Nov 07 16:40:15 1996 +0100
@@ -41,7 +41,7 @@
 ].
 !
 
-|whoAmI thisIsMySystem|
+|whoAmI thisIsMySystem conf systemType|
 
 'reading keyboard.rc ...' infoPrintCR.
 Smalltalk fileIn:'keyboard.rc'.
@@ -133,10 +133,21 @@
 "/ BTW: its only supported on ELF systems and Linux - anyway 
 "/      (and not in the free demo release).
 "/
+conf := Smalltalk configuration.
+(conf includesString:'gcc') ifTrue:[
+    Compiler ccPath:'gcc'
+] ifFalse:[
+    Compiler ccPath:'cc'
+].
+
 Compiler stcCompilation:#default.
-Compiler stcCompilationOptions:'+optinline +inlineNew -O'.
+Compiler stcCompilationOptions:'+optinline +inlineNew'.
+
+"/ special options req'd for some systems (should be done in the host file ...)
 
-OperatingSystem getOSType = 'irix' ifTrue:[
+systemType := OperatingSystem getOSType.
+
+systemType = 'irix' ifTrue:[
     Compiler stcCompilationIncludes:'-I../../include'.
     Compiler stcCompilationDefines:'-DGLX'.
 ] ifFalse:[
@@ -152,6 +163,12 @@
 
 ].
 
+Compiler ccCompilationOptions:'-O'.
+
+systemType = 'solaris' ifTrue:[
+    Compiler ccCompilationOptions:'-O -fPIC'
+].
+
 "/ experimental: try to always keep some bytes in the pocket
 "/ this changes the memory policy, to start the background collector whenever
 "/ freespace drops below 250k or 500k have been allocated since the last GC.