From 0666a1c5da8e8bef98a65a4275f7f5877c18623d Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 14 Nov 2022 00:00:20 -0500
Subject: [PATCH] fix path to djgpp c++ compiler in ms-dos cross-compile

---
 sys/unix/hints/include/cross-pre.370 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sys/unix/hints/include/cross-pre.370 b/sys/unix/hints/include/cross-pre.370
index d991ffc53..11e0ab135 100644
--- a/sys/unix/hints/include/cross-pre.370
+++ b/sys/unix/hints/include/cross-pre.370
@@ -150,7 +150,7 @@ CFLAGS += -DCROSSCOMPILE
 TOOLTOP1 = ../lib/djgpp/bin
 TOOLTOP2 = ../lib/djgpp/i586-pc-msdosdjgpp/bin
 override TARGET_CC = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc
-override TARGET_CXX = $(TOOLTOP2)/g++
+override TARGET_CXX = $(TOOLTOP1)/i586-pc-msdosdjgpp-g++
 override TARGET_AR = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc-ar
 override TARGET_STUBEDIT = ../lib/djgpp/i586-pc-msdosdjgpp/bin/stubedit
 MSDOS_TARGET_CFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
@@ -160,6 +160,11 @@ MSDOS_TARGET_CFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
         -Wformat -Wswitch -Wshadow -Wwrite-strings \
 	-Wimplicit -Wimplicit-function-declaration -Wimplicit-int \
 	-Wmissing-parameter-type -Wold-style-definition -Wstrict-prototypes
+MSDOS_TARGET_CXXFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
+        $(LUAINCL) -DDLB $(PDCURSESDEF) \
+        -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \
+        -Wall -Wextra -Wno-missing-field-initializers -Wreturn-type -Wunused \
+        -Wformat -Wswitch -Wshadow -Wwrite-strings -Wno-maybe-uninitialized
 PDCINCL += -I$(PDCPORT)
 PDC_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
 			-Wno-missing-prototypes
@@ -175,8 +180,12 @@ LUA_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS)
 override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wmissing-declarations \
 			-Wmissing-prototypes -pedantic -Wmissing-declarations \
 			-Wformat-nonliteral
-override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
+override TARGET_CXXFLAGS = $(MSDOS_TARGET_CXXFLAGS)
+ifdef CPLUSPLUS_NEEDED
+override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-g++
+else
 override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc
+endif
 override TARGET_LFLAGS=
 override TARGET_LIBS += -lpc
 override SYSSRC = ../sys/share/pcmain.c ../sys/msdos/msdos.c \