diff options
| author | Steve Hay <SteveHay@planit.com> | 2005-02-15 13:20:40 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-02-15 13:20:40 +0000 |
| commit | 646e33b6c26a24d89e6543ab606cb6a803ed6126 (patch) | |
| tree | 20bca2ef7a445244b62ad18f96f6101d61dfc8c1 /win32 | |
| parent | beb7ea05639dd45e5efb7c5681abbf11349121ca (diff) | |
| download | perl-646e33b6c26a24d89e6543ab606cb6a803ed6126.tar.gz | |
Fix PERL_MALLOC/DEBUG_MSTATS options in Win32 makefiles
Currently, if USE_IMP_SYS is defined then PERL_MALLOC gets undefined.
We should also undefine DEBUG_MSTATS if PERL_MALLOC is (or has become)
undefined, and we should do all this *before* inspecting DEBUG_MSTATS
to see if we need to add -DPERL_DEBUGGING_MSTATS to BUILDOPT.
p4raw-id: //depot/perl@23970
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 15 | ||||
| -rw-r--r-- | win32/makefile.mk | 16 |
2 files changed, 14 insertions, 17 deletions
diff --git a/win32/Makefile b/win32/Makefile index eb43c0fffe..dbebf619a1 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -206,21 +206,22 @@ D_CRYPT = define CRYPT_FLAG = -DHAVE_DES_FCRYPT !ENDIF +!IF "$(USE_IMP_SYS)" == "define" +PERL_MALLOC = undef +DEBUG_MSTATS = undef +!ENDIF + !IF "$(PERL_MALLOC)" == "" PERL_MALLOC = undef -DEBUG_MSTATS = undef +DEBUG_MSTATS = undef !ENDIF !IF "$(DEBUG_MSTATS)" == "" -DEBUG_MSTATS = undef +DEBUG_MSTATS = undef !ENDIF !IF "$(DEBUG_MSTATS)" == "define" -BUILDOPT = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS -!ENDIF - -!IF "$(USE_IMP_SYS)" == "define" -PERL_MALLOC = undef +BUILDOPT = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS !ENDIF !IF "$(USE_MULTI)" == "" diff --git a/win32/makefile.mk b/win32/makefile.mk index 44f1371cdd..b8add53b59 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -162,7 +162,7 @@ CRYPT_SRC *= fcrypt.c # This must be enabled to use the Devel::Peek::mstat() function. This cannot # be enabled without PERL_MALLOC as well. # -#DEBUG_MSTATS *= define +#DEBUG_MSTATS *= define # # set the install locations of the compiler include/libraries @@ -238,6 +238,7 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT .ENDIF PERL_MALLOC *= undef +DEBUG_MSTATS *= undef USE_MULTI *= undef USE_ITHREADS *= undef @@ -246,21 +247,16 @@ USE_PERLIO *= undef USE_LARGE_FILES *= undef USE_PERLCRT *= undef -.IF "$(PERL_MALLOC)" == "undef" +.IF "$(USE_IMP_SYS)" == "define" PERL_MALLOC = undef -DEBUG_MSTATS = undef .ENDIF -.IF "$(DEBUG_MSTATS)" == "undef" -DEBUG_MSTATS = undef +.IF "$(PERL_MALLOC)" == "undef" +DEBUG_MSTATS = undef .ENDIF .IF "$(DEBUG_MSTATS)" == "define" -BUILDOPT += -DPERL_DEBUGGING_MSTATS -.ENDIF - -.IF "$(USE_IMP_SYS)" == "define" -PERL_MALLOC = undef +BUILDOPT += -DPERL_DEBUGGING_MSTATS .ENDIF .IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef" |