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 /x2p | |
| 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 'x2p')
| -rwxr-xr-x | x2p/Makefile.SH | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH index 296fdc8efc..127d6f922f 100755 --- a/x2p/Makefile.SH +++ b/x2p/Makefile.SH @@ -26,6 +26,14 @@ esac echo "Extracting x2p/Makefile (with variable substitutions)" rm -f Makefile + +# The .PL extractions 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! # $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 92/08/07 18:29:07 $ # @@ -63,6 +71,7 @@ OPTIMIZE = $optimize .SUFFIXES: .c \$(OBJ_EXT) RUN = $run +PERL = $perl !GROK!THIS! @@ -173,10 +182,8 @@ hlist: shlist: echo $(sh) | tr ' ' $(TRNL) >.shlist -# These should be automatically generated - $(plextract): - $(RUN) ../miniperl -I../lib $@.PL + $(RUN) $(PERL) -I../lib $@.PL find2perl: find2perl.PL |