possible band-aid for cygwin build of perl@17061

Message-ID: <OF846EEF0D.EE48F625-ON85256BD3.0002CB12@55.25.11>

p4raw-id: //depot/perl@17136

diff --git a/Makefile.SH b/Makefile.SH
index 07b8da07c4557fc2585ce1426134bf33347c1b84..7759a28a51c12213dd606845b4d723b68ac822a9 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -378,9 +378,19 @@ perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE)
        sh writemain $(DYNALOADER) $(static_ext) > writemain.tmp
        sh mv-if-diff writemain.tmp perlmain.c
 
+!NO!SUBS!
+case "$osname" in
+cygwin)
+       ;; # Let cygwin/Makefile.SHs do its work.
+*)
+       $spitshell >>Makefile <<'!NO!SUBS!'
 perlmain$(OBJ_EXT): perlmain.c
        $(CCCMD) $(PLDLFLAGS) $*.c
 
+!NO!SUBS!
+       ;;
+esac
+$spitshell >>Makefile <<'!NO!SUBS!'
 # The file ext.libs is a list of libraries that must be linked in
 # for static extensions, e.g. -lm -lgdbm, etc.  The individual
 # static extension Makefile's add to it.

diff --git a/README.cygwin b/README.cygwin
index 72a4dd1aecbc84066c2e742274a2f2ec4ef6a6fb..026da0d58baf0cc88db48045b093b539aa33aad6 100644 (file)
--- a/README.cygwin
+++ b/README.cygwin
@@ -502,8 +502,6 @@ be kept as clean as possible (listing not updated yet).
 
 =head1 BUGS ON CYGWIN
 
-When I<make> starts, it warns about overriding commands for F<perlmain.o>.
-
 Support for swapping real and effective user and group IDs is incomplete.
 On WinNT Cygwin provides setuid(), seteuid(), setgid() and setegid().
 However, additional Cygwin calls for manipulating WinNT access tokens