--- parrot-current/config/init/hints/solaris.pm	Wed Feb 11 08:21:13 2009
+++ parrot-andy/config/init/hints/solaris.pm	Thu Feb 12 21:25:08 2009
@@ -40,15 +40,12 @@
         %gnuc = eval $conf->cc_run() or die "Can't run the test program: $!";
         if ( defined $gnuc{__GNUC__} ) {
             $link = 'g++';
-            unless ($conf->data->get('rpath')) {
-                $conf->data->set( 'rpath', '-Wl,-rpath=' );
-            }
         }
         else {
             $link =~ s/\bcc\b/CC/;
-            unless ($conf->data->get('rpath')) {
-                $conf->data->set( 'rpath', '-R' );
-            }
+        }
+        unless ($conf->data->get('rpath')) {
+            $conf->data->set( 'rpath', '-R' );
         }
         $conf->data->set( link => $link );
         $conf->data->deltrigger( "cc", "solaris_link" );