(replaced by #14322)

The #14300 broke hints file handling.

p4raw-id: //depot/perl@14317

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 08caa7b..8daf275 100644 (file)
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -163,9 +163,20 @@ sub eval_in_subdirs {
 sub eval_in_x {
     my($self,$dir) = @_;
     package main;
-    chdir $dir or Carp::carp("Couldn't change to directory $dir: $!");
+    chdir $dir or
+       Carp::carp("Couldn't change to directory $dir: $!");
+
+    {
+       local *FH;
+       open(FH,"Makefile.PL") or
+           Carp::carp("Couldn't open Makefile.PL in $dir");
+       local $/; # Sluuurp.
+       my $eval = join "", <FH>;
+       close FH;
+       # eval, not do, since we need lexical variables
+       eval $eval;
+    }
 
-    eval { do './Makefile.PL' };
     if ($@) {
 #        if ($@ =~ /prerequisites/) {
 #            die "MakeMaker WARNING: $@";