Make mkdepend failures a fatal condition.

Treat nsinstall & mkdepend as HOST_PROGRAMs so that they don't call mkdepend to generate dependencies.
Bug #179895 r=bryner

config/Makefile.in

@@ -27,28 +27,22 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifneq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-ifdef CROSS_COMPILE
 HOST_PROGRAM	= nsinstall$(BIN_SUFFIX)
-else
-PROGRAM		= nsinstall$(BIN_SUFFIX)
-endif
+HOST_CSRCS	= nsinstall.c pathsub.c
 endif
 
 PLSRCS		= nfspwd.pl revdepth.pl
-ifdef CROSS_COMPILE
-HOST_CSRCS	= nsinstall.c pathsub.c
-else
-CSRCS		= nsinstall.c pathsub.c
-endif
 
-TARGETS		= $(HOST_PROGRAM) $(PROGRAM) $(PLSRCS:.pl=) $(SIMPLE_PROGRAMS)
+TARGETS		= $(HOST_PROGRAM) $(PLSRCS:.pl=) $(SIMPLE_PROGRAMS)
 
 # Generate the build number on the fly.
 TARGETS		+= build_number nsBuildID.h
 
+ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 TARGETS		+= elf-dynstr-gc
 endif
+endif
 
 ifeq ($(OS_ARCH), Darwin)
 # XXX Setting CPP_PROG_LINK is ugly, but it works (it makes nsinstall
@@ -151,13 +145,15 @@ nsBuildID.h: nsBuildID.h.in build_number
 	$(RM) $@
 	$(PERL) -I$(srcdir) $(srcdir)/aboutime.pl $@ build_number $(srcdir)/nsBuildID.h.in
 
+ifndef CROSS_COMPILE
+ifdef USE_ELF_DYNSTR_GC
 elf-dynstr-gc: elf-dynstr-gc.c Makefile Makefile.in
 	$(CC) $(COMPILE_CFLAGS) $(GLIB_CFLAGS) $(GLIB_LIBS) $(LDFLAGS) -o $@ $<
 
-ifdef USE_ELF_DYNSTR_GC
 export:: elf-dynstr-gc
 	$(INSTALL) -m 555 elf-dynstr-gc $(DIST)/bin
 endif
+endif
 
 FORCE:
 

config/autoconf.mk.in

@@ -218,8 +218,10 @@ HOST_CC		= @HOST_CC@
 HOST_CXX	= @HOST_CXX@
 HOST_CFLAGS	= @HOST_CFLAGS@
 HOST_CXXFLAGS	= @HOST_CXXFLAGS@
+HOST_OPTIMIZE_FLAGS = @HOST_OPTIMIZE_FLAGS@
 HOST_NSPR_MDCPUCFG = @HOST_NSPR_MDCPUCFG@
 HOST_AR		= @HOST_AR@
+HOST_LD		= @HOST_LD@
 HOST_RANLIB	= @HOST_RANLIB@
 
 HOST_LIBIDL_CONFIG = @HOST_LIBIDL_CONFIG@

config/config.mk

@@ -483,6 +483,22 @@ endif # MOZ_OPTIMIZE == 1
 LDFLAGS		+= $(MOZ_OPTIMIZE_LDFLAGS)
 endif # MOZ_OPTIMIZE
 
+ifdef CROSS_COMPILE
+HOST_CFLAGS	+= $(HOST_OPTIMIZE_FLAGS)
+else
+ifdef MOZ_OPTIMIZE
+ifeq (1,$(MOZ_OPTIMIZE))
+ifdef MODULE_OPTIMIZE_FLAGS
+HOST_CFLAGS	+= $(MODULE_OPTIMIZE_FLAGS)
+else
+HOST_CFLAGS	+= $(MOZ_OPTIMIZE_FLAGS)
+endif # MODULE_OPTIMIZE_FLAGS
+else
+HOST_CFLAGS	+= $(MOZ_OPTIMIZE_FLAGS)
+endif # MOZ_OPTIMIZE == 1
+endif # MOZ_OPTIMIZE
+endif # CROSS_COMPILE
+
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 ifdef USE_STATIC_LIBS
 RTL_FLAGS += /Gd-

config/mkdepend/Makefile.in

@@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk
 MOZILLA_OFFICIAL =
 BUILD_OFFICIAL   =
 MODULE		 = mkdepend
-PROGRAM		 = mkdepend$(BIN_SUFFIX)
+HOST_PROGRAM	 = mkdepend$(BIN_SUFFIX)
 ifdef GNU_CC
 MODULE_OPTIMIZE_FLAGS = -O3
 else
@@ -39,7 +39,7 @@ MODULE_OPTIMIZE_FLAGS = -fast
 endif
 endif
 
-CSRCS		= \
+HOST_CSRCS	= \
 		cppsetup.c \
 		ifparser.c \
 		include.c \
@@ -50,12 +50,12 @@ CSRCS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
 
 ifdef GNU_CC
 _GCCDIR		= $(shell $(CC) -print-file-name=include)
-DEFINES		+= -DPREINCDIR=\"$(_GCCDIR)\"
+HOST_CFLAGS	+= -DPREINCDIR=\"$(_GCCDIR)\"
 endif
 
-export:: $(PROGRAM)
+export:: $(HOST_PROGRAM)
 

config/rules.mk

@@ -747,7 +747,11 @@ endif
 endif
 
 $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
+ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+	$(HOST_LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS)
+else
 	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
+endif
 
 #
 # This is an attempt to support generation of multiple binaries
@@ -779,7 +783,7 @@ ifdef MOZ_POST_PROGRAM_COMMAND
 endif
 
 $(HOST_SIMPLE_PROGRAMS): host_%$(BIN_SUFFIX): %.ho $(HOST_EXTRA_DEPS) Makefile Makefile.in
-	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(INCLUDES) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
+	$(HOST_CC) $(OUTOPTION)$@ $(HOST_CFLAGS) $(INCLUDES) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 
 #
 # Purify target.  Solaris/sparc only to start.
@@ -945,23 +949,21 @@ _MDDEPFILE = $(MDDEPDIR)/$(@F).pp
 ifeq ($(OS_ARCH),WINNT)
 define MAKE_DEPS_AUTO
 if test -d $(@D); then \
-	set -e ; \
+	echo "Building deps for $(srcdir)/$(<F)"; \
 	touch $(_MDDEPFILE) && \
 	$(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(INCLUDES) $(srcdir)/$(<F) >/dev/null 2>&1 && \
 	mv $(_MDDEPFILE) $(_MDDEPFILE).old && \
 	cat $(_MDDEPFILE).old | sed -e "s|^$(srcdir)/||g" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \
-	echo "Building deps for $(srcdir)/$(<F)"; \
 fi
 endef
 else
 define MAKE_DEPS_AUTO
 if test -d $(@D); then \
-	set -e ; \
+	echo "Building deps for $<"; \
 	touch $(_MDDEPFILE) && \
 	$(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(INCLUDES) $< >/dev/null 2>&1 && \
 	mv $(_MDDEPFILE) $(_MDDEPFILE).old && \
 	cat $(_MDDEPFILE).old | sed -e "s|^$(<D)/||g" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \
-	echo "Building deps for $<"; \
 fi
 endef
 endif # WINNT

configure.in

@@ -733,18 +733,46 @@ dnl ========================================================
 dnl System overrides of the defaults for host
 dnl ========================================================
 case "$host" in
+*-beos*)
+    HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE -DNO_X11"
+    HOST_NSPR_MDCPUCFG='\"md/_beos.cfg\"'
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+    ;;
+
+*cygwin*|*mingw*|*mksnt*|*msvc*)
+    HOST_CFLAGS="$HOST_CFLAGS -TC -nologo -DXP_PC -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11"
+    HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
+    ;;
+
+*-darwin*)
+    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+    HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+    ;;
+
 *-linux*)
+    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+    ;;
+
+*os2*)
+    HOST_CFLAGS="$HOST_CFLAGS -DXP_OS2 -DNO_X11"
+    HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
     ;;
 
 *-osf*)
+    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_NSPR_MDCPUCFG='\"md/_osf1.cfg\"'
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
     ;;
 
-*cygwin*)
-    HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
+*)
+    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
     ;;
-
 esac
 
 dnl ========================================================
@@ -955,6 +983,7 @@ case "$target" in
         fi
         HOST_CC='$(CC)'
         HOST_CXX='$(CXX)'
+        HOST_LD='$(LD)'
         AR='lib -NOLOGO -OUT:"$@"'
         AR_FLAGS=
         RANLIB='echo not_ranlib'
@@ -4745,8 +4774,9 @@ AC_SUBST(HOST_CC)
 AC_SUBST(HOST_CXX)
 AC_SUBST(HOST_CFLAGS)
 AC_SUBST(HOST_CXXFLAGS)
-
+AC_SUBST(HOST_OPTIMIZE_FLAGS)
 AC_SUBST(HOST_AR)
+AC_SUBST(HOST_LD)
 AC_SUBST(HOST_RANLIB)
 AC_SUBST(HOST_NSPR_MDCPUCFG)