disable libbacktrace for mac

Author: bilam

.github/workflows/jsource.yml

@@ -221,12 +221,6 @@ jobs:
    - name: Test JE (macOS)
      run: |
       script/testga.sh darwin || exit 1
-      rm -rf j64/jconsole.dSYM
-      rm -rf j64/libj.dylib.dSYM
-      rm -rf j64/libjavx2.dylib.dSYM
-      rm -rf j64/libjavx512.dylib.dSYM
-      rm -rf j64/libtsdll.dylib.dSYM
-      rm -rf j64/jamalgam.dSYM
       cd j64
       strip -S jconsole
       strip -S libj.dylib
@@ -277,12 +271,6 @@ jobs:
    - name: Test JE (macOS arm64)
      run: |
       script/testga.sh darwin || exit 1
-      rm -rf j64/jconsole.dSYM
-      rm -rf j64/libj.dylib.dSYM
-      rm -rf j64/libjavx2.dylib.dSYM
-      rm -rf j64/libjavx512.dylib.dSYM
-      rm -rf j64/libtsdll.dylib.dSYM
-      rm -rf j64/jamalgam.dSYM
       cd j64
       strip -S jconsole
       strip -S libj.dylib
@@ -335,12 +323,6 @@ jobs:
      env:
       _DEBUG: 3
      run: |
-      rm -rf j64/jconsole.dSYM
-      rm -rf j64/libj.dylib.dSYM
-      rm -rf j64/libjavx2.dylib.dSYM
-      rm -rf j64/libjavx512.dylib.dSYM
-      rm -rf j64/libtsdll.dylib.dSYM
-      rm -rf j64/jamalgam.dSYM
       script/testga.sh darwin || exit 1
       ls -l j64
       zip -r m64d.zip j64
@@ -386,12 +368,6 @@ jobs:
      env:
       _DEBUG: 3
      run: |
-      rm -rf j64/jconsole.dSYM
-      rm -rf j64/libj.dylib.dSYM
-      rm -rf j64/libjavx2.dylib.dSYM
-      rm -rf j64/libjavx512.dylib.dSYM
-      rm -rf j64/libtsdll.dylib.dSYM
-      rm -rf j64/jamalgam.dSYM
       script/testga.sh darwin || exit 1
       ls -l j64
       zip -r m64armd.zip j64

jsrc/jconsole.c

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

script/buildga.sh

@@ -260,17 +260,6 @@ if [ "$1" = "linux" ]; then
  cp pcre2/linux/i386/libjpcre2.so tools/regex/libjpcre2_32.so
 fi
 
-# if [ "$1" = "darwin" ] && [ -d j64 ] ; then
-#  cd j64
-#  dsymutil jconsole 2> /dev/null || true
-#  dsymutil libj.dylib 2> /dev/null || true
-#  dsymutil libjavx2.dylib 2> /dev/null || true
-#  dsymutil libjavx512.dylib 2> /dev/null || true
-#  dsymutil libtsdll.dylib 2> /dev/null || true
-#  dsymutil jamalgam 2> /dev/null || true
-#  cd ..
-# fi
-
 if [ -d j64 ]; then
  find j64 -type d -exec chmod 755 {} \;
  find j64 -type f -exec chmod 644 {} \;