From: Ilya Zakharevich Date: Mon, 31 Mar 2003 12:53:01 +0000 (-0800) Subject: Integrate: X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=12724655a0993f91aa01e1070345dfd5a3d78ed1;p=p5sagit%2Fp5-mst-13.2.git Integrate: [ 19109] Subject: [PATCH 5.8.1 @19053] Time::HiRes Message-ID: <20030331205301.GA3687@math.berkeley.edu> [ 19111] A cleaner way to detect PERL_CORE, from IlyaZ. p4raw-link: @19111 on //depot/maint-5.8/perl: 180158515bf55baba130dc335fb25e9d48016830 p4raw-link: @19109 on //depot/maint-5.8/perl: 0de7851241e3f1d50d1f426c11333d0f72bd7fcb p4raw-id: //depot/perl@19121 p4raw-integrated: from //depot/maint-5.8/perl@19120 'copy in' ext/Time/HiRes/HiRes.t (@18080..) ext/Time/HiRes/Makefile.PL (@18922..) --- diff --git a/ext/Time/HiRes/HiRes.t b/ext/Time/HiRes/HiRes.t index 1cc2c76..90e0979 100644 --- a/ext/Time/HiRes/HiRes.t +++ b/ext/Time/HiRes/HiRes.t @@ -30,7 +30,7 @@ import Time::HiRes 'ualarm' if $have_ualarm; use Config; -my $xdefine; +my $xdefine = ''; if (open(XDEFINE, "xdefine")) { chomp($xdefine = ); diff --git a/ext/Time/HiRes/Makefile.PL b/ext/Time/HiRes/Makefile.PL index 2071792..6e0ba43 100644 --- a/ext/Time/HiRes/Makefile.PL +++ b/ext/Time/HiRes/Makefile.PL @@ -14,8 +14,8 @@ my $DEFINE; my $LIBS; my $XSOPT; -unless($ENV{PERL_CORE}) { # This trick from Encode/Makefile.PL. - $ENV{PERL_CORE} = 1 if ($^X =~ m{\bminiperl[^/\\\]>:]*$}o); +unless($ENV{PERL_CORE}) { + $ENV{PERL_CORE} = 1 if grep { $_ eq 'PERL_CORE=1' } @ARGV; } # Perls 5.002 and 5.003 did not have File::Spec, fake what we need.