Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit b830fc5

Browse files
committed
cygwin: support libperl.dll.a without cperl
1 parent 05118c5 commit b830fc5

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

Makefile.SH

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,13 @@ true)
7575
-install_name \$(shrpdir)/\$@"
7676
;;
7777
cygwin*)
78-
shrpldflags="$shrpldflags -Wl,--out-implib=libcperl.dll.a \
78+
pkg=$package
79+
if $test "$package" = "perl5"; then
80+
pkg=perl
81+
fi
82+
shrpldflags="$shrpldflags -Wl,--out-implib=lib${pkg}.dll.a \
7983
-Wl,--image-base,0x52000000"
80-
linklibperl="-L. -lcperl"
84+
linklibperl="-L. -l${pkg}"
8185
;;
8286
sunos*)
8387
linklibperl="-lperl"
@@ -92,29 +96,29 @@ true)
9296
aix*)
9397
case "$cc" in
9498
gcc*)
95-
shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bM:SRE -Wl,-bE:perl.exp"
96-
case "$osvers" in
99+
shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bM:SRE -Wl,-bE:perl.exp"
100+
case "$osvers" in
97101
3*) shrpldflags="$shrpldflags -e _nostart"
98102
;;
99103
*) shrpldflags="$shrpldflags -Wl,-bnoentry"
100104
;;
101-
esac
102-
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
103-
linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
104-
linklibperl_nonshr='-lperl_nonshr'
105-
;;
105+
esac
106+
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
107+
linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
108+
linklibperl_nonshr='-lperl_nonshr'
109+
;;
106110
*)
107-
shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
108-
case "$osvers" in
111+
shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
112+
case "$osvers" in
109113
3*) shrpldflags="$shrpldflags -e _nostart"
110114
;;
111115
*) shrpldflags="$shrpldflags -b noentry"
112116
;;
113-
esac
114-
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
115-
linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
116-
linklibperl_nonshr='-lperl_nonshr'
117-
;;
117+
esac
118+
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
119+
linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
120+
linklibperl_nonshr='-lperl_nonshr'
121+
;;
118122
esac
119123
;;
120124
hpux*)
@@ -974,10 +978,12 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT)
974978
!NO!SUBS!
975979
;;
976980
cygwin) # cperl compat: make -lperl work
977-
$spitshell >>$Makefile <<'!NO!SUBS!'
981+
if $test "$package" != "perl5"; then
982+
$spitshell >>$Makefile <<'!NO!SUBS!'
978983
rm -f libperl.dll.a
979984
ln -s libcperl.dll.a libperl.dll.a
980985
!NO!SUBS!
986+
fi
981987
;;
982988
esac
983989
;;

0 commit comments

Comments
 (0)