about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2020-06-30 15:30:27 -0400
committerRich Felker <dalias@aerifal.cx>2020-06-30 15:38:27 -0400
commitea6d7847ac128f02d1f01ffd01e68341df34ac6e (patch)
treef1493cd4cd6dc040143b8b77b5988eaf73186981
parente71188fa051c70128c1c880164c222c34b1749c3 (diff)
downloadmusl-ea6d7847ac128f02d1f01ffd01e68341df34ac6e.tar.gz
musl-ea6d7847ac128f02d1f01ffd01e68341df34ac6e.tar.xz
musl-ea6d7847ac128f02d1f01ffd01e68341df34ac6e.zip
make mallocng the default malloc implementation
-rw-r--r--Makefile2
-rwxr-xr-xconfigure4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3d3e3622..e8cc4436 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ includedir = $(prefix)/include
 libdir = $(prefix)/lib
 syslibdir = /lib
 
-MALLOC_DIR = oldmalloc
+MALLOC_DIR = mallocng
 SRC_DIRS = $(addprefix $(srcdir)/,src/* src/malloc/$(MALLOC_DIR) crt ldso $(COMPAT_SRC_DIRS))
 BASE_GLOBS = $(addsuffix /*.c,$(SRC_DIRS))
 ARCH_GLOBS = $(addsuffix /$(ARCH)/*.[csS],$(SRC_DIRS))
diff --git a/configure b/configure
index 0dfd2d17..18fda9af 100755
--- a/configure
+++ b/configure
@@ -36,7 +36,7 @@ Optional features:
   --disable-static        inhibit building static library [enabled]
 
 Optional packages:
-  --with-malloc=...       choose malloc implementation [oldmalloc]
+  --with-malloc=...       choose malloc implementation [mallocng]
 
 Some influential environment variables:
   CC                      C compiler command [detected]
@@ -142,7 +142,7 @@ static=yes
 wrapper=auto
 gcc_wrapper=no
 clang_wrapper=no
-malloc_dir=oldmalloc
+malloc_dir=mallocng
 
 for arg ; do
 case "$arg" in