diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 1999-07-31 00:45:12 -0400 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-08-01 20:59:59 +0000 |
| commit | 3cfae81b38bc8edd77142113464ee12c2a2e5af0 (patch) | |
| tree | 06dfba65718e52a2f5b475c60077ce21639209e6 /os2/Makefile.SHs | |
| parent | 6dce6b70b85ef184fc8b4432d2436d1be5f0b117 (diff) | |
| download | perl-3cfae81b38bc8edd77142113464ee12c2a2e5af0.tar.gz | |
slightly modified version of suggested patch
Message-Id: <199907311406.IAA25034@localhost.frii.com>
Subject: [PATCH 5.005_58] Fix OS/2 build
p4raw-id: //depot/perl@3856
Diffstat (limited to 'os2/Makefile.SHs')
| -rw-r--r-- | os2/Makefile.SHs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index c732aced9f..f7f840258a 100644 --- a/os2/Makefile.SHs +++ b/os2/Makefile.SHs @@ -11,7 +11,7 @@ case "$archname" in *-thread*) perl_fullversion="${perl_fullversion}-threaded";; esac -dll_post="`echo $perl_fullversion | sum | awk '{print $1}'`" +dll_post="`echo $perl_fullversion | sum | sed -e 's/^0*//' | awk '{print $1}'`" dll_post="`printf '%x' $dll_post | tr '[a-z]' '[A-Z]'`" $spitshell >>Makefile <<!GROK!THIS! @@ -62,9 +62,9 @@ t/$(PERL_DLL): $(PERL_DLL) $(LNS) $(PERL_DLL) t/$(PERL_DLL) $(PERL_DLL): $(obj) perl5.def perl$(OBJ_EXT) - $(LD) $(LD_OPT) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) $(libs) perl5.def + $(LD) $(LD_OPT) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) $(libs) perl5.def || ( rm $(PERL_DLL) && sh -c false ) -perl5.def: perl.linkexp +perl5.olddef: perl.linkexp echo "LIBRARY '$(PERL_DLL_BASE)' INITINSTANCE TERMINSTANCE" > $@ echo DESCRIPTION "'Perl interpreter v$(PERL_FULLVERSION), export autogenerated, built with $(CONFIG_ARGS)'" >>$@ echo STACKSIZE 32768 >>$@ @@ -96,10 +96,8 @@ perl.linkexp: perl.exports perl.map os2/os2.sym # We link miniperl statically, since .DLL depends on $(DYNALOADER) -perl.map miniperl: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT) +miniperl.map miniperl: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) $(obj) $(libs) -Zmap -Zlinker /map - awk '{if ($$3 == "") print $$2}' <miniperl.map | sort | uniq > perl.map - rm miniperl.map @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest depend: os2ish.h dlfcn.h os2thread.h os2.c |