diff options
| author | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2017-10-23 18:33:11 +0100 |
|---|---|---|
| committer | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2017-10-23 18:38:35 +0100 |
| commit | fc9d6b910c7baee72351e03254e0f222933316b2 (patch) | |
| tree | 99f55df36b8a7d3025c7b35e39b4868f38be7373 /dist | |
| parent | 1cc318ccd01de3f743427faa3a82731c57c38a1c (diff) | |
| download | perl-fc9d6b910c7baee72351e03254e0f222933316b2.tar.gz | |
Avoid loading .bs files twice when using XSLoader
When a .bs file is found, XSLoader::load() falls back to
DynalLoader::bootstrap() which will load it, so there's no need to do
it twice.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/XSLoader/XSLoader_pm.PL | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL index 8012e35e32..41179b2211 100644 --- a/dist/XSLoader/XSLoader_pm.PL +++ b/dist/XSLoader/XSLoader_pm.PL @@ -11,7 +11,7 @@ print OUT <<'EOT'; package XSLoader; -$VERSION = "0.27"; +$VERSION = "0.28"; #use strict; @@ -145,8 +145,7 @@ print OUT <<'EOT'; if (-s $bs) { # only read file if it's not empty # print STDERR "BS: $bs ($^O, $dlsrc)\n" if $dl_debug; - eval { local @INC = ('.'); do $bs; }; - warn "$bs: $@\n" if $@; + # This calls DynaLoader::bootstrap, which loads the .bs file goto \&XSLoader::bootstrap_inherit; } |