From dbda2967cc6907712bc457619b2130066230d10d Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Thu, 7 Mar 2024 15:50:05 -0500
Subject: [PATCH] attempt to fix MS-DOS cross-compile

---
 include/config.h | 3 +++
 include/global.h | 4 ++--
 src/end.c        | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/config.h b/include/config.h
index 96351d3ca..ba49103f1 100644
--- a/include/config.h
+++ b/include/config.h
@@ -259,6 +259,9 @@
 # ifdef CRASHREPORT
 #  undef CRASHREPORT
 # endif
+# ifdef MSDOS
+#  undef PANICTRACE
+# endif
 #endif
 
 #ifdef CRASHREPORT
diff --git a/include/global.h b/include/global.h
index 0fae6d2ac..4c9692aca 100644
--- a/include/global.h
+++ b/include/global.h
@@ -460,11 +460,11 @@ extern struct nomakedefs_s nomakedefs;
 #ifdef UNIX
 #if (NH_DEVEL_STATUS != NH_STATUS_RELEASED)
 /* see end.c */
-#if !defined(CROSS_TO_WASM)
+#if !defined(CROSS_TO_WASM) && !defined(CROSS_TO_MSDOS)
 #ifndef PANICTRACE
 #define PANICTRACE
 #endif  /* PANICTRACE */
-#endif  /* CROSS_TO_WASM */
+#endif  /* CROSS_TO_WASM |  CROSS_TO_MSDOS */
 #endif  /* NH_DEVEL_STATUS != NH_STATUS_RELEASED */
 #endif  /* UNIX */
 
diff --git a/src/end.c b/src/end.c
index 9803079ce..bc6aa5588 100644
--- a/src/end.c
+++ b/src/end.c
@@ -1898,8 +1898,10 @@ build_english_list(char *in)
 void
 NH_abort(char *why USED_FOR_CRASHREPORT)
 {
+#ifdef PANICTRACE
     int gdb_prio = SYSOPT_PANICTRACE_GDB;
     int libc_prio = SYSOPT_PANICTRACE_LIBC;
+#endif
     static volatile boolean aborting = FALSE;
 
     /* don't execute this code recursively if a second abort is requested
@@ -1908,6 +1910,7 @@ NH_abort(char *why USED_FOR_CRASHREPORT)
         return;
     aborting = TRUE;
 
+#ifdef PANICTRACE
 #ifdef CRASHREPORT
     if(!submit_web_report(1, "Panic", why))
 #endif
@@ -1935,6 +1938,7 @@ NH_abort(char *why USED_FOR_CRASHREPORT)
 #ifndef NO_SIGNAL
     panictrace_setsignals(FALSE);
 #endif
+#endif /* PANICTRACE */
     NH_abort_;
 }
 #undef USED_FOR_CRASHREPORT