diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 18:49:43 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 18:49:43 +0000 |
| commit | b250498faaf6fbd04315d2b632649596e2498c42 (patch) | |
| tree | 25f6de9511b199debdbf56b7ff77e5c37b5288ef /cygwin | |
| parent | 036b4402dc24284de44ae733b52896d6fd4fbb77 (diff) | |
| download | perl-b250498faaf6fbd04315d2b632649596e2498c42.tar.gz | |
integrate cfgperl changes#6261..6266 into mainline
p4raw-link: @6266 on //depot/cfgperl: a009ce76c9b4ddbde44a58eab3fe27d331cf27fe
p4raw-link: @6261 on //depot/cfgperl: 27d76ecff97d0a9449f569d789504cc8b69a6d01
p4raw-id: //depot/perl@6363
p4raw-integrated: from //depot/cfgperl@6362 'copy in' README.epoc
epoc/createpkg.pl epoc/epocish.c (@5586..) epoc/epocish.h
t/comp/require.t (@5639..) cygwin/Makefile.SHs (@6096..)
ext/POSIX/POSIX.pm (@6140..) hints/bsdos.sh (@6156..)
epoc/config.sh (@6168..) ext/POSIX/POSIX.xs (@6198..)
p4raw-integrated: from //depot/cfgperl@6265 'copy in'
ext/POSIX/POSIX.pod (@5586..)
p4raw-integrated: from //depot/cfgperl@6263 'copy in' doop.c (@6256..)
p4raw-integrated: from //depot/cfgperl@6261 'merge in' pod/perldiag.pod
(@6206..) toke.c (@6250..)
Diffstat (limited to 'cygwin')
| -rw-r--r-- | cygwin/Makefile.SHs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cygwin/Makefile.SHs b/cygwin/Makefile.SHs index ca083d43cd..120e8eee1f 100644 --- a/cygwin/Makefile.SHs +++ b/cygwin/Makefile.SHs @@ -157,10 +157,15 @@ esac # libperl.a is _the_ library both in dll and static cases # $(LIBPERL)$(LIB_EXT) expands to this name dependless of build model # +# NOTE: The "-Wl,-Bstatic $(LLIBPERL) -Wl,-Bdynamic" is required to give +# the import library linking priority over the dynamic library, since both +# the .dll and .a are in the same directory. When the new standard for +# naming import/dynamic/static libraries emerges this should be updated. +# $spitshell >>Makefile <<'!NO!SUBS!' perl: $& perlmain$(OBJ_EXT) $(LIBPERL)$(LIB_EXT) $(DYNALOADER) $(static_ext) ext.libs - $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) + $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) -Wl,-Bstatic $(LLIBPERL) -Wl,-Bdynamic `cat ext.libs` $(libs) pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL)$(LIB_EXT) $(DYNALOADER) $(static_ext) ext.libs $(SHRPENV) $(LDLIBPTH) purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) |