[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.340.2.14,1.340.2.15
Status: Beta
Brought to you by:
kwilliams
From: Ken W. <kwi...@us...> - 2005-01-24 03:50:35
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12342/lib/Module/Build Modified Files: Tag: release-0_26_branch Base.pm Log Message: Use -I instead of PERL5LIB in run_perl_script() Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.340.2.14 retrieving revision 1.340.2.15 diff -u -d -r1.340.2.14 -r1.340.2.15 --- Base.pm 24 Jan 2005 03:40:30 -0000 1.340.2.14 +++ Base.pm 24 Jan 2005 03:50:19 -0000 1.340.2.15 @@ -957,8 +957,6 @@ sub _default_INC { my $self = shift; - local $ENV{PERL5LIB}; # this is not considered part of the default. - my $perl = ref($self) ? $self->perl : $self->find_perl_interpreter; my @inc = `$perl -le "print for \@INC"`; @@ -2605,11 +2603,13 @@ } my $perl = ref($self) ? $self->perl : $self->find_perl_interpreter; - # Make sure our local additions to @INC are propagated to the subprocess + # Make sure our local additions to @INC are propagated to the + # subprocess. It seems to work better on systems with very large + # @INCs to use -I instead of $ENV{PERL5LIB}. my $c = ref $self ? $self->config : \%Config::Config; - local $ENV{PERL5LIB} = join $c->{path_sep}, $self->_added_to_INC; - - return $self->do_system($perl, @$preargs, $script, @$postargs); + my @inc = map { "-I$_" } $self->_added_to_INC; + + return $self->do_system($perl, @inc, @$preargs, $script, @$postargs); } sub process_xs { |