cross-compile fix-up

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 2e4be51143d175efa0fe2b131892e411b2c630c5..51b7e06c8f1c7f598261c8f81099a33802ad0635 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/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 \

diff --git a/util/makedefs.c b/util/makedefs.c
index 24c45d67666d2a3ddead51e715374b70941bedb8..f8636c893bd39bbdbe0b1603903c6d221be753bf 100644 (file)
--- a/util/makedefs.c
+++ b/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
     {