diff options
| author | Andy Dougherty <doughera@lafayette.edu> | 2010-10-13 13:27:12 -0400 |
|---|---|---|
| committer | Andy Dougherty <doughera@lafayette.edu> | 2010-10-14 08:29:43 -0400 |
| commit | 939767c9d84f9288c260508432b50879f71e1d3b (patch) | |
| tree | 749772a89363c6cb9d6e7cf28bbd24045e93e764 /utils | |
| parent | 8525cfaee6f338e972e8c944b87855a29a5b67c3 (diff) | |
| download | perl-939767c9d84f9288c260508432b50879f71e1d3b.tar.gz | |
Fix x2p and utils dependencies for static builds
The x2p and utils .PL extractions use the Cwd module, which is not
available in miniperl in a static build. (For a dynamic build, miniperl
only loads the pure perl portion of Cwd, but building the whole extension
ensures that the pure perl part is correctly built and available. It might
be cleaner just to always require the full perl.)
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 3 | ||||
| -rw-r--r-- | utils/Makefile.SH | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/utils/Makefile b/utils/Makefile index 4d56bea80c..aaa0b5fcd5 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,3 +1,6 @@ +# Generated from utils/Makefile.SH. The generated file is +# shipped with the source kit for systems such as win32 +# which don't do .SH extraction. PERL = ../miniperl REALPERL = ../perl diff --git a/utils/Makefile.SH b/utils/Makefile.SH index b5a2f12bb1..6601c1341b 100644 --- a/utils/Makefile.SH +++ b/utils/Makefile.SH @@ -26,9 +26,18 @@ esac echo "Extracting utils/Makefile (with variable substitutions)" rm -f Makefile +# These use the Cwd extension. For statically-built perls, we +# need perl, not just miniperl. +case "$usedl" in + define) perl="../miniperl" ;; + *) perl="../perl" ;; +esac cat >Makefile <<!GROK!THIS! +# Generated from utils/Makefile.SH. The generated file is +# shipped with the source kit for systems such as win32 +# which don't do .SH extraction. -PERL = ../miniperl +PERL = $perl REALPERL = ../perl RUN = $run # Used mainly cross-compilation setups. |