X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fblib.pm;h=98f1612da5124ede1bb093263a90175fcc3c4d6e;hb=031444c208a641407a9c485b4619db54f43e6b7f;hp=45ccd9b5184509d4c3f515980cdd5689c318c00f;hpb=98225a64488c895097b3ce3f7ac9c94f464be86b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/blib.pm b/lib/blib.pm
index 45ccd9b..98f1612 100644
--- a/lib/blib.pm
+++ b/lib/blib.pm
@@ -46,7 +46,18 @@ $Verbose = 0;
 sub import
 {
  my $package = shift;
- my $dir = getcwd;
+ my $dir;
+ if ($^O eq "MSWin32" && -f "Win32.xs") {
+     # We don't use getcwd() on Windows because it will internally
+     # call Win32::GetCwd(), which will get the Win32 module loaded.
+     # That means that it would not be possible to run `make test`
+     # for the Win32 module because blib.pm would always load the
+     # installed version before @INC gets updated with the blib path.
+     chomp($dir = `cd`);
+ }
+ else {
+     $dir = getcwd;
+ }
  if ($^O eq 'VMS') { ($dir = VMS::Filespec::unixify($dir)) =~ s-/\z--; }
  if (@_)
   {