diff options
| author | Reini Urban <rurban@x-ray.at> | 2008-07-28 14:55:40 +0200 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2008-08-22 15:09:27 +0000 |
| commit | 56e771c1bc71c994cd5a877d8b2eadd47e254ff8 (patch) | |
| tree | 977aa29940aa3588d2af7924fbbc1a5f441808be /Configure | |
| parent | 5da8ab6323d17be276daf351faaf9b9ac9344406 (diff) | |
| download | perl-56e771c1bc71c994cd5a877d8b2eadd47e254ff8.tar.gz | |
Cygwin build harmonization, remove cygwin/Makefile.SHs
From: "Reini Urban" <rurban@x-ray.at>
Message-ID: <6910a60807280355g129511d9v61c9763c3fd12a27@mail.gmail.com>
p4raw-id: //depot/perl@34218
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Fri Aug 8 16:16:43 CEST 2008 [metaconfig 3.5 PL0] +# Generated on Fri Aug 22 17:08:28 CEST 2008 [metaconfig 3.5 PL0] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -8151,9 +8151,9 @@ true) # a version-specific architecture-dependent library, the version # number isn't really that important, except for making cc/ld happy. # - # A name such as libperl.so.3.1 + # A name such as libperl.so.10.1 majmin="libperl.$so.$patchlevel.$subversion" - # A name such as libperl.so.301 + # A name such as libperl.so.100 majonly=`echo $patchlevel $subversion | $awk '{printf "%d%02d", $1, $2}'` majonly=libperl.$so.$majonly @@ -8167,8 +8167,12 @@ true) linux*|gnu*) # ld won't link with a bare -lperl otherwise. dflt=libperl.$so ;; - cygwin*) # ld links against an importlib - dflt=libperl$lib_ext + cygwin*) # ld links now against the dll directly + majmin="cygperl5_${patchlevel}_${subversion}.${so}" + majonly=`echo $patchlevel $subversion | + $awk '{printf "%03d%03d", $1, $2}'` + majonly=cygperl5.$majonly.$so + dflt=$majmin ;; *) # Try to guess based on whether libc has major.minor. case "$libc" in @@ -8264,6 +8268,9 @@ if "$useshrplib"; then # hpux doesn't like the default, either. tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\"" ;; + cygwin) + # cygwin needs only ldlibpth + ;; *) tmp_shrpenv="env LD_RUN_PATH=$shrpdir" ;; |