diff options
| author | Fifer, Eric <EFifer@sanwaint.com> | 1999-05-12 21:25:54 +0100 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-05-17 08:26:21 +0000 |
| commit | f89d6eaa35318513fcfc9665bbb2d0bcea3326ee (patch) | |
| tree | 3d53229a1881c9ddf922b9b45cc7e3f2d0da37c6 /cygwin32 | |
| parent | 4c2d12df80a53518a6a39a9dea25c4d82a2e6e47 (diff) | |
| download | perl-f89d6eaa35318513fcfc9665bbb2d0bcea3326ee.tar.gz | |
additional cleanups for cygwin32 port
Message-ID: <71E287AB0D94D111BBD600600849EC8185EDAF@POST>
Subject: [PATCH]perl5.005_03 (CORE) cygwin32 port
p4raw-id: //depot/perl@3430
Diffstat (limited to 'cygwin32')
| -rw-r--r-- | cygwin32/Makefile.SHs | 10 | ||||
| -rw-r--r-- | cygwin32/impure_ptr.c | 18 | ||||
| -rw-r--r-- | cygwin32/perlld.in | 2 |
3 files changed, 4 insertions, 26 deletions
diff --git a/cygwin32/Makefile.SHs b/cygwin32/Makefile.SHs index fcbc318022..a675d7433d 100644 --- a/cygwin32/Makefile.SHs +++ b/cygwin32/Makefile.SHs @@ -26,7 +26,7 @@ addtopath=`pwd` $spitshell >>Makefile <<!GROK!THIS! # shell script feeding perlld to decent perl -ld2: $& Makefile perlld ${src}/cygwin32/ld2.in ${src}/impure_ptr\$(OBJ_EXT) +ld2: $& Makefile perlld ${src}/cygwin32/ld2.in @echo "extracting ld2 (with variable substitutions)" @$sed s,@buildpath@,$addtopath,g <${src}/cygwin32/ld2.in >ld2 !GROK!THIS! @@ -49,7 +49,7 @@ EXPORT_ALL = 1 DEF_EXT = .def EXP_EXT = .exp -perlld: $& Makefile ${src}/cygwin32/perlld.in ${src}/impure_ptr\$(OBJ_EXT) +perlld: $& Makefile ${src}/cygwin32/perlld.in @echo "extracting perlld (with variable substitutions)" @$sed -e s,@CC@,\${CC}, -e s,@DLLWRAP@,\${DLLWRAP},g \\ -e s,@WRAPDRIVER@,\${WRAPDRIVER},g -e s,@DLLTOOL@,\${DLLTOOL},g \\ @@ -83,8 +83,7 @@ AWK = $awk case "$useshrplib" in true) $spitshell >>Makefile <<'!NO!SUBS!' -# impure pointer initialisation -cwobj = impure_ptr$(OBJ_EXT) $(obj) +cwobj = $(obj) # override default rule (NB: make croaks!) to force dll usage perlmain$(OBJ_EXT): perlmain.c @@ -95,9 +94,6 @@ perlmain$(OBJ_EXT): perlmain.c $(LIBPERL)s$(LIB_EXT): $& perl$(OBJ_EXT) $(cwobj) $(AR) rcu $@ perl$(OBJ_EXT) $(cwobj) -impure_ptr$(OBJ_EXT): cygwin32/impure_ptr.c - $(CCCMD) $(PLDLFLAGS) cygwin32/impure_ptr.c - # dll and import library $(LIBPERL)$(LIB_EXT): $& perl$(OBJ_EXT) $(cwobj) ld2 $(LDLIBPTH) ld2 $(SHRPLDFLAGS) -o $(LIBPERL)$(DLSUFFIX) \ diff --git a/cygwin32/impure_ptr.c b/cygwin32/impure_ptr.c deleted file mode 100644 index bbe98714fe..0000000000 --- a/cygwin32/impure_ptr.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * impure_ptr initialization routine. This is needed - * for any DLL that needs to output to the main (calling) - * executable's stdout, stderr, etc. - */ - -struct _reent *_impure_ptr; /* this will be the Dlls local copy of impure ptr */ - -/********************************************* - * Function to set our local (in this dll) - * copy of impure_ptr to the main's - * (calling executable's) impure_ptr - */ -void impure_setup(struct _reent *_impure_ptrMain){ - - _impure_ptr = _impure_ptrMain; - -} diff --git a/cygwin32/perlld.in b/cygwin32/perlld.in index 1e82877178..19a1a2f7b9 100644 --- a/cygwin32/perlld.in +++ b/cygwin32/perlld.in @@ -55,7 +55,7 @@ if ($args !~ /\-o (\S+)/) { $libname ="lib$libname" unless ($libname =~ /^lib/); print DEBUGFILE "dll name: $dllname\nimport library: $libname\npath: $path\n" if $DEBUG; - $command ="$DLLWRAP --dllname $dllname --exclude-symbol=_impure_ptr"; + $command ="$DLLWRAP --dllname $dllname"; $command .=" --driver-name $WRAPDRIVER" if $WRAPDRIVER; $command .=" --dlltool $DLLTOOL" if $DLLTOOL; $command .=" --export-all-symbols" if $EXPORT_ALL; |