Splitting debug and debug-memory configure options.

diff --git a/auto/cc b/auto/cc
index 3ffb64c2429838425600dfd95f86a5e7ae8acec4..02c04a7f3c7495a96c1ebd1aa88c96f920b41364 100644 (file)
--- a/auto/cc
+++ b/auto/cc
@@ -170,8 +170,10 @@ case $NJS_CC_NAME in
 esac
 
 if [ "$NJS_DEBUG" = "YES" ]; then
-        NJS_CC_OPT="$NJS_CC_OPT -O0"
         njs_define=NJS_DEBUG . auto/define
+fi
+
+if [ "$NJS_DEBUG_MEMORY" = "YES" ]; then
         njs_define=NJS_DEBUG_MEMORY . auto/define
 fi
 

diff --git a/auto/help b/auto/help
index c9c307c11ad42a64ac4f55ecc71dff10f2a96a89..ac20f7b3858396f503614d39d1086cf40e66f53f 100644 (file)
--- a/auto/help
+++ b/auto/help
@@ -16,6 +16,8 @@ default: "$NJS_LD_OPT"
 
   --debug=YES               enables additional runtime checks, \
 default: "$NJS_DEBUG"
+  --debug-memory=YES        enables memory alloc debug, \
+default: "$NJS_DEBUG_MEMORY"
   --address-sanitizer=YES   enables build with address sanitizer, \
 default: "$NJS_ADDRESS_SANITIZER"
 END

diff --git a/auto/options b/auto/options
index a7495b82df1597d12edd0fb4d80615a0063945f7..021f73571932a91efb1c3a367596be224c3c5f3c 100644 (file)
--- a/auto/options
+++ b/auto/options
@@ -7,6 +7,7 @@ NJS_CC_OPT=${NJS_CC_OPT:--O}
 NJS_LD_OPT=${NJS_CC_OPT:--O}
 
 NJS_DEBUG=NO
+NJS_DEBUG_MEMORY=NO
 NJS_ADDRESS_SANITIZER=NO
 
 NJS_CONFIGURE_OPTIONS=
@@ -25,6 +26,7 @@ do
         --ar=*)                          AR="$value"                         ;;
 
         --debug=*)                       NJS_DEBUG="$value"                  ;;
+        --debug-memory=*)                NJS_DEBUG_MEMORY="$value"           ;;
         --address-sanitizer=*)           NJS_ADDRESS_SANITIZER="$value"      ;;
 
         --help)