gistfile1.diff

diff --git a/usr/src/cmd/perl/Makefile b/usr/src/cmd/perl/Makefile
index 1d81319..6684980 100644
--- a/usr/src/cmd/perl/Makefile
+++ b/usr/src/cmd/perl/Makefile
@@ -32,7 +32,7 @@ clean := TARGET = clean
 test   := TARGET = test
 
 # PERL_LEGACY is versions of Perl still delivered through ON
-PERL_VERSIONS = 5.10.0
+PERL_VERSIONS = 5.12
 
 .PARALLEL: $(PERL_VERSIONS)
 
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/Makefile.PL b/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/Makefile.PL
index cbd36eb..2f9a9df 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/Makefile.PL
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/Makefile.PL
@@ -22,6 +22,9 @@
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+#
+# Copyright 2011 Joyent Inc
+#
 
 require 5.8.4;
 use strict;
@@ -51,6 +54,12 @@ my $pver = sprintf('%vd', $^V);
 # Figure out the appropriate Config.pm.  Use an older version if necessary.
 my $perlarch = ($arch eq "sparc") ? "sun4-solaris-64int":"i86pc-solaris-64int";
 
+if (! -d "/usr/perl5/$pver") {
+   my ($maj, $min, $micro);
+   ($maj, $min, $micro)  = split(/\./, $pver, 3);
+   $pver = join(".", $maj, $min);
+}
+
 my $configpm = "/usr/perl5/$pver/lib/$perlarch/Config.pm";
 if (! -f $configpm) {
        my $p = "config/$pver";