Skip to content

Commit c693b67

Browse files
nwc10Nicholas Clarck
authored and
Nicholas Clarck
committed
Simplify Makefile generation for cygwin
The rule to generate cygwin.c with a symbolic link from cygwin/cygwin.c can actually be written to the generated Makefile on all platforms, as it causes no problems if not used. It only "triggers" when a cygwin.o is part of the Makefile macro ARCHOBJS, at which point suffix rules permit make to infer that cygwin.o can be generated from cygwin.c, and cygwin.c from cygwin/cygwin.c The rule to generate LIBPERL_NONSHR is not used. It seems that it was never used. It was added in July 2008 as part of commit 5f9145a: Cygwin build harmonization, remove cygwin/Makefile.SHs but the rule added to the top level Makefile.SH doesn't seem to correspond to any rule in the removed file cygwin/Makefile.SHs
1 parent 619c007 commit c693b67

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

Makefile.SH

+3-13
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,9 @@ done
745745

746746
$spitshell >>$Makefile <<'!NO!SUBS!'
747747
748+
cygwin.c: cygwin/cygwin.c
749+
$(LNS) cygwin/cygwin.c
750+
748751
globals$(OBJ_EXT): $(generated_headers)
749752
750753
uudmap.h mg_data.h: bitcount.h
@@ -856,19 +859,6 @@ MINIPERLEXP = miniperl
856859
perl5.def: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map
857860
$(MINIPERL) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
858861
859-
!NO!SUBS!
860-
;;
861-
cygwin)
862-
$spitshell >>$Makefile <<'!NO!SUBS!'
863-
cygwin.c: cygwin/cygwin.c
864-
$(LNS) cygwin/cygwin.c
865-
866-
LIBPERL_NONSHR = libperl$(LIB_EXT)
867-
868-
$(LIBPERL_NONSHR): $(perllib_objs)
869-
$(RMS) $(LIBPERL_NONSHR)
870-
$(AR) rc $(LIBPERL_NONSHR) $(perllib_objs)
871-
872862
!NO!SUBS!
873863
;;
874864
esac

0 commit comments

Comments
 (0)