Don't check flex when cross building.

1 files changed, 25 insertions, 3 deletions

diff --git a/Makefile.in b/Makefile.in
index 3cb00fd..56d97ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -369,7 +369,15 @@ ALL_MODULES = \
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
-CHECK_MODULES = \
+# This is a list of the check targets for all of the modules which are
+# compiled using $(FLAGS_TO_PASS).
+#
+# The list is in two parts.  Those that only have checks when 
+# compiling 
+CROSS_CHECK_MODULES = \
+	check-flex
+
+HOST_ONLY_CHECK_MODULES = \
 	check-autoconf \
 	check-bfd \
 	check-binutils \
@@ -414,6 +422,7 @@ CHECK_MODULES = \
 	check-time \
 	check-uudecode \
 	check-wdiff
+CHECK_MODULES=$(HOST_ONLY_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
@@ -701,8 +710,21 @@ $(ALL_MODULES) all-glob all-gui:
 
 # This rule is used to check the modules which use FLAGS_TO_PASS.  To
 # build a target check-X means to cd to X and make all.
-.PHONY: $(CHECK_MODULES) 
-$(CHECK_MODULES):
+
+.PHONY: $(CHECK_MODULES) $(HOST_ONLY_CHECK_MODULES) $(CROSS_CHECK_MODULES)
+$(HOST_ONLY_CHECK_MODULES):
+	if [ $(host_canonical) = $(target_canonical) ] ; then \
+	  @dir=`echo $@ | sed -e 's/check-//'`; \
+	  if [ -f ./$${dir}/Makefile ] ; then \
+	    r=`pwd`; export r; \
+	    srcroot=`cd $(srcdir); pwd`; export srcroot; \
+	    (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
+	  else \
+	    true; \
+	  fi; \
+	fi
+
+$(CROSS_CHECK_MODULES):
 	@dir=`echo $@ | sed -e 's/check-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
 	  r=`pwd`; export r; \