From aacfbecf5c5fe6b723766577076b9bb9625dac8a Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 7 Mar 2024 11:44:35 -0500 Subject: [PATCH] more CI build fixes --- azure-pipelines.yml | 3 +-- src/report.c | 3 --- sys/unix/hints/include/multiw-2.370 | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9af9c0fd6..2a8a4ee87 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -207,7 +207,6 @@ steps: sed -i '/^#[ ]*define LOGFILE/d' include/config.h sed -i '/^#[ ]*define NEWS/d' include/config.h sed -i '/^#[ ]*define PANICLOG/d' include/config.h - sed -i '/^#[ ]*define PANICTRACE/d' include/config.h #sed -i '/^#[ ]*define STATUS_HILITES/d' include/config.h sed -i '/^#[ ]*define SYSCF/d' include/config.h sed -i '/^#[ ]*define USER_SOUNDS/d' include/config.h @@ -217,7 +216,7 @@ steps: sed -i '/^#[ ]*define SHELL/d' include/unixconf.h sed -i '/^#[ ]*define SUSPEND/d' include/unixconf.h make fetch-lua - make WANT_WIN_ALL=1 all + make WANT_WIN_ALL=1 NOCRASHREPORT=1 all condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.buildTarget, 'minimal')) displayName: 'Building linux minimal build' workingDirectory: $(Agent.BuildDirectory)/$(netHackPath) diff --git a/src/report.c b/src/report.c index 218457e2b..3979151c0 100644 --- a/src/report.c +++ b/src/report.c @@ -5,9 +5,6 @@ #include "hack.h" /* NB: CRASHREPORT implies PANICTRACE */ -#ifndef PANICTRACE -#undef CRASHREPORT -#endif #ifdef CRASHREPORT diff --git a/sys/unix/hints/include/multiw-2.370 b/sys/unix/hints/include/multiw-2.370 index 2bfa75c41..938c958f3 100644 --- a/sys/unix/hints/include/multiw-2.370 +++ b/sys/unix/hints/include/multiw-2.370 @@ -194,6 +194,10 @@ CPLUSPLUS_NEEDED = 1 endif endif +ifeq "$(NOCRASHREPORT)" "1" +WINCFLAGS += -DNOCRASHREPORT +endif + #end of hints/include/multiw-2.370 #------------------------------------------------------------------------------