From 536b7827f475462828a6c7d33944f2e1d1fb2336 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 31 Mar 2015 11:34:01 -0700
Subject: [PATCH 1/3] Add multilib support code only for target

	* multi.m4 (AC_OUTPUT_COMMANDS): Don't add multilib support code
	if ${multi_basedir}/config-ml.in doesn't exist.
---
 config/multi.m4 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/multi.m4 b/config/multi.m4
index 5b62ecc..53993c3 100644
--- a/config/multi.m4
+++ b/config/multi.m4
@@ -46,12 +46,15 @@ fi
 
 AC_OUTPUT_COMMANDS([
 # Only add multilib support code if we just rebuilt the top-level
-# Makefile.
-case " $CONFIG_FILES " in
- *" ]m4_default([$1],Makefile)[ "*)
-   ac_file=]m4_default([$1],Makefile)[ . ${multi_basedir}/config-ml.in
-   ;;
-esac],
+# Makefile.  If ${multi_basedir}/config-ml.in doesn't exist, we aren't
+# building for target and we don't add multilib support code.
+if test -f ${multi_basedir}/config-ml.in; then
+  case " $CONFIG_FILES " in
+   *" ]m4_default([$1],Makefile)[ "*)
+     ac_file=]m4_default([$1],Makefile)[ . ${multi_basedir}/config-ml.in
+     ;;
+  esac
+fi],
 		   [
 srcdir="$srcdir"
 host="$host"
-- 
1.9.3