In perl.git, the branch smoke-me/make_ext has been updated <http://perl5.git.perl.org/perl.git/commitdiff/cd4accc8c989e83d25f40c08d08f7e84fda2570d?hp=642ef7c1b91288be96b948fea0661bf371c74551>
- Log ----------------------------------------------------------------- commit cd4accc8c989e83d25f40c08d08f7e84fda2570d Author: Nicholas Clark <[email protected]> Date: Fri Apr 27 12:05:38 2012 +0200 make_ext.pl need not manipulate @INC, as buildcustomize.pl already does it. Remove from make_ext.pl code that predates the introduction of buildcustomize.pl, as that now sets up @INC correctly before make_ext.pl even runs. During the build process make_ext.pl is only run by miniperl. M make_ext.pl commit e8bfaa05c0cb79bb4313228ca09692de520eedf2 Author: Nicholas Clark <[email protected]> Date: Fri Apr 27 13:05:26 2012 +0200 In make_ext.pl, move loading FindExt and Cwd into the Win32-only code. As Cwd is now required instead of used and hence doesn't export, qualify the calls to getcwd() with the package name. M make_ext.pl ----------------------------------------------------------------------- Summary of changes: make_ext.pl | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/make_ext.pl b/make_ext.pl index d6561b1..cf1e826 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -2,15 +2,6 @@ use strict; use warnings; use Config; -BEGIN { - if ($^O eq 'MSWin32') { - unshift @INC, '../dist/Cwd'; - require FindExt; - } else { - unshift @INC, 'dist/Cwd'; - } -} -use Cwd; my $is_Win32 = $^O eq 'MSWin32'; my $is_VMS = $^O eq 'VMS'; @@ -147,7 +138,9 @@ my $perl; my %extra_passthrough; if ($is_Win32) { - my $build = getcwd(); + require Cwd; + require FindExt; + my $build = Cwd::getcwd(); $perl = $^X; if ($perl =~ m#^\.\.#) { my $here = $build; @@ -167,7 +160,7 @@ if ($is_Win32) { print "In $build"; foreach my $dir (@dirs) { chdir($dir) or die "Cannot cd to $dir: $!\n"; - (my $ext = getcwd()) =~ s{/}{\\}g; + (my $ext = Cwd::getcwd()) =~ s{/}{\\}g; FindExt::scan_ext($ext); FindExt::set_static_extensions(split ' ', $Config{static_ext}); chdir $build -- Perl5 Master Repository
