diff options
| author | Vadim Konovalov <vkonovalov@lucent.com> | 2005-06-13 11:41:41 -0400 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-06-13 16:35:19 +0000 |
| commit | 9e7cf449d83cd5f918126cacc6de91f23f4d9822 (patch) | |
| tree | d43db885751da30bed2605e648633fc9e947f7e5 /win32 | |
| parent | 427d62a407a31445bc7585263d1b781552e27ce5 (diff) | |
| download | perl-9e7cf449d83cd5f918126cacc6de91f23f4d9822.tar.gz | |
Re: Change 24806: improve static build for win32/Makefile
Message-Id: <1118691701.6333.32.camel@mdk10>
p4raw-id: //depot/perl@24825
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 11 | ||||
| -rw-r--r-- | win32/makefile.mk | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/win32/Makefile b/win32/Makefile index 8ba95a5117..33ddc80de9 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -696,7 +696,8 @@ SETARGV_OBJ = setargv$(o) !ENDIF # specify static extensions here -STATIC_EXT = Cwd Compress/Zlib +#STATIC_EXT = Cwd Compress/Zlib +STATIC_EXT = DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader SOCKET = $(EXTDIR)\Socket\Socket @@ -957,8 +958,7 @@ perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl CCTYPE=$(CCTYPE) > perldll.def $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static - $(MINIPERL) -I..\lib buildext.pl --list-static-libs > stat-exts.tmp - $(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @stat-exts.tmp @<< + $(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @Extensions_static @<< $(LINK_FLAGS) $(DELAYLOAD) $(LIBFILES) $(PERLDLL_OBJ) $(PERLDLL_RES) << $(XCOPY) $(PERLIMPLIB) $(COREDIR) @@ -1030,8 +1030,9 @@ Extensions: buildext.pl $(PERLDEP) $(CONFIGPM) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic Extensions_static : buildext.pl - $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static + $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static + $(MINIPERL) -I..\lib buildext.pl --list-static-libs > Extensions_static Extensions_clean: -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean @@ -1110,7 +1111,6 @@ distclean: realclean -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \ $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD) -del /f *.def *.map - -del /f stat-exts.tmp -del /f $(EXTENSION_DLL) -del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm -del /f $(EXTDIR)\DynaLoader\dl_win32.xs @@ -1274,6 +1274,7 @@ _clean : -@$(DEL) ..\x2p\*.exe ..\x2p\*.bat -@$(DEL) *.ilk -@$(DEL) *.pdb + -@$(DEL) Extensions_static clean : Extensions_clean _clean diff --git a/win32/makefile.mk b/win32/makefile.mk index 5aa8efbd1b..66ebf55b00 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1095,7 +1095,7 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static $(LIBFILES) perl.exp $(LKPOST)) .ELSE $(LINK32) -dll -def:perldll.def -out:$@ \ - $(shell $(MINIPERL) -I..\lib buildext.pl --list-static-libs) \ + @Extensions_static \ @$(mktmp -base:0x28000000 $(BLINK_FLAGS) $(DELAYLOAD) $(LIBFILES) \ $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,$B,)) .ENDIF @@ -1181,8 +1181,9 @@ Extensions : buildext.pl $(PERLDEP) $(CONFIGPM) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic Extensions_static : buildext.pl - $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static + $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static + $(MINIPERL) -I..\lib buildext.pl --list-static-libs > Extensions_static Extensions_clean : -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean @@ -1426,6 +1427,7 @@ _clean : -@erase ..\x2p\*.exe ..\x2p\*.bat -@erase *.ilk -@erase *.pdb + -@erase Extensions_static clean : Extensions_clean _clean |