summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--perlio.c2
-rw-r--r--win32/makefile.mk8
2 files changed, 8 insertions, 2 deletions
diff --git a/perlio.c b/perlio.c
index 4ffcc2ec57..a0856afbbb 100644
--- a/perlio.c
+++ b/perlio.c
@@ -2957,7 +2957,9 @@ PerlIO_init(void)
{
if (!_perlio)
{
+#ifndef WIN32
atexit(&PerlIO_cleanup);
+#endif
}
}
diff --git a/win32/makefile.mk b/win32/makefile.mk
index c4a1398b1c..974deb3483 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -437,10 +437,14 @@ PERLDLL_RES =
.IF "$(CFG)" == "Debug"
.IF "$(CCTYPE)" == "MSVC20"
OPTIMIZE = -Od -MD -Z7 -DDEBUGGING
+LINK_DBG = -debug -pdb:none
.ELSE
-OPTIMIZE = -Od -MD -Zi -DDEBUGGING
+# -Zi requires .pdb file(s)
+#OPTIMIZE = -Od -MD -Zi -DDEBUGGING
+#LINK_DBG = -debug
+OPTIMIZE = -O1 -MD -Z7 -DDEBUGGING
+LINK_DBG = -debug -debugtype:both -pdb:none
.ENDIF
-LINK_DBG = -debug -pdb:none
.ELSE
.IF "$(CFG)" == "Optimize"
# -O1 yields smaller code, which turns out to be faster than -O2