integrate cfgperl changes#6261..6266 into mainline

[perl5.git] / cygwin / Makefile.SHs

diff --git a/cygwin/Makefile.SHs b/cygwin/Makefile.SHs
index d466bde..120e8ee 100644 (file)
--- a/cygwin/Makefile.SHs
+++ b/cygwin/Makefile.SHs
@@ -25,6 +25,9 @@ esac
 addtopath=`pwd`
 $spitshell >>Makefile <<!GROK!THIS!
 
+cygwin.c: cygwin/cygwin.c
+       \$(LNS) cygwin/cygwin.c
+
 # shell script feeding perlld to decent perl
 ld2: $& Makefile perlld ${src}/cygwin/ld2.in
        @echo "extracting ld2 (with variable substitutions)"
@@ -33,12 +36,9 @@ ld2: $& Makefile perlld ${src}/cygwin/ld2.in
 # install is included in Cygwin distributions, and we make a note of th
 # requirement in the README.cygwin file. However, let's give them
 # a warning.
-       @if test -n "`type $1 2>&1 | sed -n -e '/'$1'$/p'`" ; then \
-               install -c -m 755 ld2 ${installbin}/ld2 ; \
-       else \
+       @install -c -m 755 ld2 ${installbin}/ld2
+       @if test ! -f  ${installbin}/ld2; then \
                echo "*************************************************" ; \
-               echo "Oh, no! You didn't read the README.cygwin" ; \
-               echo "file, which stated that \"install\" was required." ; \
                echo "Make will probably fail in a few more steps." ; \
                echo "When it does, copy \"ld2\" to a directory in" ; \
                echo "your path, other than \".\"." ; \
@@ -157,13 +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!'
 
-opmini$(OBJ_EXT) : op.c
-       $(CCCMD) $(PLDLFLAGS) -DPERL_EXTERNAL_GLOB -o opmini$(OBJ_EXT) op.c
-
 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)