From 7025945d2a6dc4cae08c1a446ba3c2f474fcea4e Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 23 May 2026 22:50:12 -0400
Subject: [PATCH] Get CROSSCOMPILE defined earlier in the Makefiles

---
 sys/unix/hints/include/cross-pre1.500 | 1 +
 sys/unix/hints/include/cross-pre2.500 | 7 -------
 sys/unix/hints/linux.500              | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/sys/unix/hints/include/cross-pre1.500 b/sys/unix/hints/include/cross-pre1.500
index 9c8c0a24c..1730f5af3 100644
--- a/sys/unix/hints/include/cross-pre1.500
+++ b/sys/unix/hints/include/cross-pre1.500
@@ -50,6 +50,7 @@ override TARGET_LIBS=
 endif
 
 ifdef CROSS
+CROSSCOMPILE=1
 override PREGAME=
 override BUILDMORE=
 override CLEANMORE=
diff --git a/sys/unix/hints/include/cross-pre2.500 b/sys/unix/hints/include/cross-pre2.500
index ea5d31767..ef6f1c04f 100644
--- a/sys/unix/hints/include/cross-pre2.500
+++ b/sys/unix/hints/include/cross-pre2.500
@@ -123,8 +123,6 @@ ifdef CROSS_TO_MSDOS
 #=================================================================
 
 CFLAGS += -DCROSSCOMPILE
-#also set a make variable flagging this as a crosscompile
-CROSSCOMPILE=1
 
 #
 # Override the build tools and some obj files to
@@ -277,7 +275,6 @@ ifdef CROSS_TO_WASM
 # originally from https://github.com/NetHack/NetHack/pull/385
 #===============-=================================================
 #also set a make variable flagging this as a crosscompile
-CROSSCOMPILE=1
 #
 #WASM_DEBUG = 1
 WASM_DATA_DIR = $(TARGETPFX)wasm-data
@@ -414,8 +411,6 @@ ifdef CROSS_TO_MIPS
 #=================================================================
 
 CFLAGS += -DCROSSCOMPILE
-#also set a make variable flagging this as a crosscompile
-CROSSCOMPILE=1
 
 #
 # Override the build tools and some obj files to
@@ -492,8 +487,6 @@ ifdef CROSS_TO_AMIGA
 #=================================================================
 
 CFLAGS += -DCROSSCOMPILE
-#also set a make variable flagging this as a crosscompile
-CROSSCOMPILE=1
 
 #
 # Override the build tools and some obj files to
diff --git a/sys/unix/hints/linux.500 b/sys/unix/hints/linux.500
index 1bb35460d..776d74529 100755
--- a/sys/unix/hints/linux.500
+++ b/sys/unix/hints/linux.500
@@ -384,7 +384,7 @@ ifdef WANT_WIN_X11
 USE_XPM=1
 WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-GENTILEOFILE = $(SRCDIR)/tile.o
+GENTILEOFILE = $(TARGETPFX)tile.o
 # -x: if built without dlb, some versions of mkfontdir think *.lev are fonts
 POSTINSTALL += bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
 # separate from CFLAGS so that we don't pass it to every file