summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2012-11-03 00:04:08 +0000
committerrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2012-11-03 00:04:08 +0000
commite7a8e31751b07ae420e647a881c7832bd60e77f2 (patch)
tree96f9a7692aa84c32401150dfff82a42efaa477f4
parent77c2dabb427f5eefc05003e3cb6d90865a0bfe6e (diff)
Added blurb for malloc() superseding.
Also define the unit when USE_MY_MALLOC is present, not just $mallocobj. git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@152 2592e710-e01b-42a5-8df0-11608a6cc53d
-rw-r--r--mcon/U/mallocsrc.U14
1 files changed, 12 insertions, 2 deletions
diff --git a/mcon/U/mallocsrc.U b/mcon/U/mallocsrc.U
index 5a4197a..66d304e 100644
--- a/mcon/U/mallocsrc.U
+++ b/mcon/U/mallocsrc.U
@@ -21,7 +21,7 @@
?RCS:
?MAKE:mallocsrc mallocobj usemymalloc malloctype d_mymalloc \
freetype: Myread \
- Oldconfig package Guess Setvar rm cat +cc +ccflags Findhdr \
+ Oldconfig package spackage Guess Setvar rm cat +cc +ccflags Findhdr \
i_malloc i_stdlib sed libs _o ptrsize
?MAKE: -pick add $@ %<
?X: Put near top so that other tests don't erroneously include
@@ -76,7 +76,7 @@
?LINT:change libs
?X: Cannot test for mallocsrc; it is the unit's name and there is a bug in
?X: the interpreter which defines all the names, even though they are not used.
-@if mallocobj
+@if mallocobj || USE_MY_MALLOC
: determine which malloc to compile in
echo " "
case "$usemymalloc" in
@@ -89,6 +89,16 @@ case "$usemymalloc" in
esac
;;
esac
+$cat <<EOM
+$spackage comes with its own malloc() implementation that will supersede
+the version included in your C library. Since proper memory allocation is
+critical, you may choose to opt out from this specific implementation and
+rely on the (hopefully) more thoroughly tested version in the C library.
+
+If you change your mind later, you can always re-run this configuration
+script and recompile $package from scratch.
+
+EOM
rp="Do you wish to attempt to use the malloc() that comes with $package?"
. ./myread
usemymalloc="$ans"