cross-compile fix-up

sys/unix/Makefile.src

@@ -572,7 +572,8 @@ HACKINCL = align.h artifact.h artilist.h attrib.h botl.h \
 HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h dgn_file.h
 
 # the following .o's _must_ be made before any others (for makedefs)
-HOSTOBJ = monst.o objects.o alloc.o drawing.o
+FIRSTOBJ = monst.o objects.o
+HOSTOBJ = $(FIRSTOBJ) alloc.o drawing.o
 
 HOBJ = $(TARGETPFX)allmain.o $(TARGETPFX)alloc.o \
 	$(TARGETPFX)apply.o $(TARGETPFX)artifact.o $(TARGETPFX)attrib.o \

util/makedefs.c

@@ -1296,7 +1296,9 @@ do_date()
         Fprintf(ofp, "#define NETHACK_%sGIT_BRANCH \"%s\"\n",
                 xpref, gitbranch);
     }
+#if !defined(CROSSCOMPILE) || !defined(CROSSCOMPILE_TARGET)
     Fprintf(ofp, "#endif /* !CROSSCOMPILE || !CROSSCOMPILE_TARGET */\n");
+#endif
     Fprintf(ofp, "\n");
 #ifdef AMIGA
     {