disable libbacktrace if _DEBUG

Author: bilam

jsrc/jconsole.c

@@ -28,12 +28,16 @@
 #include "j.h"
 #include "jeload.h"
 
-#undef NOLIBBACKTRACE
 #if defined(__APPLE__) || defined(_WIN32) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__wasm__) //temporary
-#define NOLIBBACKTRACE
+#undef LIBBACKTRACE
+#else
+#undef LIBBACKTRACE
+#ifndef DEBUG
+#define LIBBACKTRACE
+#endif
 #endif
 
-#ifndef NOLIBBACKTRACE
+#ifdef LIBBACKTRACE
 #include "../libbacktrace/backtrace.h"
 #endif
 
@@ -57,7 +61,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType){
  }
 }
 #endif
-#ifndef NOLIBBACKTRACE
+#ifdef LIBBACKTRACE
 static int err_write(void *data, uintptr_t pc, const char *file, int line, const char *function){
  char buf[512];
  file = file ? file : "?";
@@ -273,7 +277,7 @@ JST* jt;
 
 int main(int argc, char* argv[])
 {
-#ifndef NOLIBBACKTRACE
+#ifdef LIBBACKTRACE
  signal(SIGSEGV,sigsegv);
  signal(SIGILL,sigsegv);
 #ifdef __APPLE__

make2/build_jamalgam.sh

@@ -10,17 +10,17 @@ if [ "" = "$CFLAGS" ]; then
  # OPTLEVEL will be merged back into CFLAGS, further down
 	# OPTLEVEL is probably overly elaborate, but it works
  case "$_DEBUG" in
-  3) OPTLEVEL=" -O2 -g "
+  3) OPTLEVEL=" -O2 -g " ; DEBUG=1
    NASM_FLAGS="-g";;
-  2) OPTLEVEL=" -O0 -ggdb -DOPTMO0 "
+  2) OPTLEVEL=" -O0 -ggdb -DOPTMO0 " ; DEBUG=1
    NASM_FLAGS="-g";;
-  1) OPTLEVEL=" -O2 -g "
+  1) OPTLEVEL=" -O2 -g " ; DEBUG=1
    NASM_FLAGS="-g"
    jplatform64=$(./jplatform64.sh)-debug;;
-  *) OPTLEVEL=" -O2 ";;
+  *) OPTLEVEL=" -O2 "; DEBUG=0 ;;
  esac
 else
- case "$CFLAGS" in *-O0*) OPTLEVEL=" -DOPTMO0 ";; *) ;; esac
+ case "$CFLAGS" in *-O0*) OPTLEVEL=" -DOPTMO0 " ; DEBUG=1 ;; *) DEBUG=0 ;; esac
 fi
 echo "jplatform64=$jplatform64"
 
@@ -166,6 +166,10 @@ fi
 
 common="$common -DJAMALGAM"
 
+if [ $DEBUG -eq 1 ] ; then
+common="$common -DDEBUG"
+fi
+
 case "$jplatform64" in
  darwin/*) common="$common -fno-common" ;;  # other platforms already default to this
 esac

make2/build_jconsole.sh

@@ -10,16 +10,17 @@ if [ "" = "$CFLAGS" ]; then
  # OPTLEVEL will be merged back into CFLAGS, further down
 	# OPTLEVEL is probably overly elaborate, but it works
  case "$_DEBUG" in
-  3) OPTLEVEL=" -O2 -g "
+  3) OPTLEVEL=" -O2 -g " ; DEBUG=1
    NASM_FLAGS="-g";;
-  2) OPTLEVEL=" -O0 -ggdb "
+  2) OPTLEVEL=" -O0 -ggdb -DOPTMO0 " ; DEBUG=1
    NASM_FLAGS="-g";;
-  1) OPTLEVEL=" -O2 -g "
+  1) OPTLEVEL=" -O2 -g " ; DEBUG=1
    NASM_FLAGS="-g"
    jplatform64=$(./jplatform64.sh)-debug;;
-  *) OPTLEVEL=" -O2 ";;
+  *) OPTLEVEL=" -O2 "; DEBUG=0 ;;
  esac
-
+else
+ case "$CFLAGS" in *-O0*) OPTLEVEL=" -DOPTMO0 " ; DEBUG=1 ;; *) DEBUG=0 ;; esac
 fi
 echo "jplatform64=$jplatform64"
 

make2/build_libj.sh

@@ -12,17 +12,17 @@ if [ "" = "$CFLAGS" ]; then
  # OPTLEVEL will be merged back into CFLAGS, further down
 	# OPTLEVEL is probably overly elaborate, but it works
  case "$_DEBUG" in
-  3) OPTLEVEL=" -O2 -g "
+  3) OPTLEVEL=" -O2 -g " ; DEBUG=1
    NASM_FLAGS="-g";;
-  2) OPTLEVEL=" -O0 -ggdb -DOPTMO0 "
+  2) OPTLEVEL=" -O0 -ggdb -DOPTMO0 " ; DEBUG=1
    NASM_FLAGS="-g";;
-  1) OPTLEVEL=" -O2 -g "
+  1) OPTLEVEL=" -O2 -g " ; DEBUG=1
    NASM_FLAGS="-g"
    jplatform64=$(./jplatform64.sh)-debug;;
-  *) OPTLEVEL=" -O2 ";;
+  *) OPTLEVEL=" -O2 "; DEBUG=0 ;;
  esac
 else
- case "$CFLAGS" in *-O0*) OPTLEVEL=" -DOPTMO0 ";; *) ;; esac
+ case "$CFLAGS" in *-O0*) OPTLEVEL=" -DOPTMO0 " ; DEBUG=1 ;; *) DEBUG=0 ;; esac
 fi
 echo "jplatform64=$jplatform64"
 
@@ -167,6 +167,10 @@ else
 
 fi
 
+if [ $DEBUG -eq 1 ] ; then
+common="$common -DDEBUG"
+fi
+
 case "$jplatform64" in
  darwin/*) common="$common -fno-common" ;;  # other platforms already default to this
 esac