diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2014-04-01 13:31:10 +0100 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2014-04-01 13:31:10 +0100 |
| commit | 4fef8ef38d8decb363e3a62f045fe83af3b1a99b (patch) | |
| tree | 41fd0ec770453cf9e08bd390f67b1ef2a47d2f75 /win32 | |
| parent | fc6712109f60b7466ab6426581de645ee93aff93 (diff) | |
| download | perl-4fef8ef38d8decb363e3a62f045fe83af3b1a99b.tar.gz | |
Reword Windows makefile comments to explain the "help" logic about USE_MULTI
There is logic to auto-enable USE_MULTI if either USE_ITHREADS or USE_IMP_SYS
(which both require USE_MULTI) are enabled, but this is not mentioned in
the comments. Explain it so that users don't get confused when trying to
disable USE_MULTI.
Reported in [perl #121494].
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 15 | ||||
| -rw-r--r-- | win32/makefile.mk | 13 |
2 files changed, 15 insertions, 13 deletions
diff --git a/win32/Makefile b/win32/Makefile index 5991a0037e..a0a3b4e502 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -59,22 +59,23 @@ INST_TOP = $(INST_DRV)\perl #USE_SITECUST = define # -# uncomment to enable multiple interpreters. This is need for fork() -# emulation and for thread support. +# uncomment to enable multiple interpreters. This is needed for fork() +# emulation and for thread support, and is auto-enabled by USE_IMP_SYS +# and USE_ITHREADS below. # USE_MULTI = define # -# Beginnings of interpreter cloning/threads; now reasonably complete. -# This should be enabled to get the fork() emulation. This needs -# USE_MULTI as well. +# Interpreter cloning/threads; now reasonably complete. +# This should be enabled to get the fork() emulation. This needs (and +# will auto-enable) USE_MULTI above. # USE_ITHREADS = define # # uncomment to enable the implicit "host" layer for all system calls -# made by perl. This needs USE_MULTI above. This is also needed to -# get fork(). +# made by perl. This is also needed to get fork(). This needs (and +# will auto-enable) USE_MULTI above. # USE_IMP_SYS = define diff --git a/win32/makefile.mk b/win32/makefile.mk index 269f4b708a..c11a7a99f3 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -65,22 +65,23 @@ INST_TOP *= $(INST_DRV)\perl #USE_SITECUST *= define # -# uncomment to enable multiple interpreters. This is need for fork() -# emulation and for thread support. +# uncomment to enable multiple interpreters. This is needed for fork() +# emulation and for thread support, and is auto-enabled by USE_IMP_SYS +# and USE_ITHREADS below. # USE_MULTI *= define # # Interpreter cloning/threads; now reasonably complete. -# This should be enabled to get the fork() emulation. -# This needs USE_MULTI above. +# This should be enabled to get the fork() emulation. This needs (and +# will auto-enable) USE_MULTI above. # USE_ITHREADS *= define # # uncomment to enable the implicit "host" layer for all system calls -# made by perl. This needs USE_MULTI above. -# This is also needed to get fork(). +# made by perl. This is also needed to get fork(). This needs (and +# will auto-enable) USE_MULTI above. # USE_IMP_SYS *= define |