summaryrefslogtreecommitdiff
path: root/win32/Makefile
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2013-06-06 23:35:55 +0100
committerSteve Hay <steve.m.hay@googlemail.com>2013-06-06 23:35:55 +0100
commitaafd2430436dddf90c1453e446b7e8b7a773ffad (patch)
tree15dd048b5e16772b6918e5023363bd8d43955c86 /win32/Makefile
parentcc0b589ad6053fdbc488399fc8b8fe992abd9e3b (diff)
downloadperl-aafd2430436dddf90c1453e446b7e8b7a773ffad.tar.gz
Simplify recipes for making perl-static.exe on Win32
There is no need to link the static extension libraries as well as the static perl library because the entire contents of all the static extension libraries have been put into the static perl library anyway. Also put the list of objects and libraries which perl.exe and perl-static.exe link against in the same order as each other, and in both makefiles, and (in makefile.mk) for both compilers, so that the similarities and differences are more readily seen.
Diffstat (limited to 'win32/Makefile')
-rw-r--r--win32/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 5d2727f066..672953a13b 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1065,15 +1065,14 @@ perlmainst$(o) : perlmainst.c
$(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
$(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) \
- $(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES)
+ $(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES) $(SETARGV_OBJ)
$(EMBED_EXE_MANI)
copy $(PERLEXE) $(WPERLEXE)
$(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS
$(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES)
$(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) \
- @Extensions_static $(PERLSTATICLIB) \
- $(LIBFILES) $(PERLEXEST_OBJ) $(SETARGV_OBJ) $(PERLEXE_RES)
+ $(PERLEXEST_OBJ) $(PERLEXE_RES) $(PERLSTATICLIB) $(LIBFILES) $(SETARGV_OBJ)
$(EMBED_EXE_MANI)
MakePPPort: $(MINIPERL) $(CONFIGPM) Extensions_nonxs