diff options
Diffstat (limited to 'win32/makefile.mk')
| -rw-r--r-- | win32/makefile.mk | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 2dcd065007..b30ff86111 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -87,15 +87,6 @@ USE_ITHREADS *= define USE_IMP_SYS *= define # -# Comment out next assign to disable perl's I/O subsystem and use compiler's -# stdio for IO - depending on your compiler vendor and run time library you may -# then get a number of fails from make test i.e. bugs - complain to them not us ;-). -# You will also be unable to take full advantage of perl5.8's support for multiple -# encodings and may see lower IO performance. You have been warned. -# -USE_PERLIO *= define - -# # Comment this out if you don't want to enable large file support for # some reason. Should normally only be changed to maintain compatibility # with an older release of perl. @@ -299,7 +290,6 @@ USE_SITECUST *= undef USE_MULTI *= undef USE_ITHREADS *= undef USE_IMP_SYS *= undef -USE_PERLIO *= undef USE_LARGE_FILES *= undef USE_64_BIT_INT *= undef USE_LONG_DOUBLE *= undef @@ -386,15 +376,7 @@ ARCHITECTURE = ia64 .IF "$(USE_MULTI)" == "define" ARCHNAME = MSWin32-$(ARCHITECTURE)-multi .ELSE -.IF "$(USE_PERLIO)" == "define" ARCHNAME = MSWin32-$(ARCHITECTURE)-perlio -.ELSE -ARCHNAME = MSWin32-$(ARCHITECTURE) -.ENDIF -.ENDIF - -.IF "$(USE_PERLIO)" == "define" -BUILDOPT += -DUSE_PERLIO .ENDIF .IF "$(USE_ITHREADS)" == "define" @@ -854,16 +836,11 @@ EXTRACORE_SRC += ..\perlio.c WIN32_SRC = \ .\win32.c \ + .\win32io.c \ .\win32sck.c \ .\win32thread.c \ .\fcrypt.c -# We need this for miniperl build unless we override canned -# config.h #define building mini\* -#.IF "$(USE_PERLIO)" == "define" -WIN32_SRC += .\win32io.c -#.ENDIF - CORE_NOCFG_H = \ ..\av.h \ ..\cop.h \ @@ -972,7 +949,6 @@ CFG_VARS = \ usethreads=$(USE_ITHREADS) ~ \ useithreads=$(USE_ITHREADS) ~ \ usemultiplicity=$(USE_MULTI) ~ \ - useperlio=$(USE_PERLIO) ~ \ use64bitint=$(USE_64_BIT_INT) ~ \ uselongdouble=$(USE_LONG_DOUBLE) ~ \ uselargefiles=$(USE_LARGE_FILES) ~ \ @@ -1198,7 +1174,7 @@ config.w32 : $(CFGSH_TMPL) # This target is for when changes to the main config.sh happen. # Edit config.gc, then make perl using GCC in a minimal configuration (i.e. -# with MULTI, ITHREADS, IMP_SYS, LARGE_FILES and PERLIO off), then make +# with MULTI, ITHREADS, IMP_SYS and LARGE_FILES off), then make # this target to regenerate config_H.gc. regen_config_h: $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \ |