From e8647d9ec7b7126f708da068184522751dbb23d1 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 04 Jun 2013 16:41:38 -0400
Subject: Enable multiarch and set MULTIARCH_DIRNAME.

This should add /usr/include/<target> to the include search list.
---
diff --git a/build b/build
index 1d94683..5cb597b 100755
--- a/build
+++ b/build
@@ -30,6 +30,7 @@ common_opts = \
 	--enable-linker-build-id \
 	--with-system-zlib \
 	--disable-multilib \
+	--enable-multiarch \
 	--without-included-gettext \
 	--with-nls \
 	--with-sysroot="$${OPK_SYSROOT:-/}" \
@@ -80,7 +81,9 @@ $(build_targets): configure
 	define_pattern=".define $${gcc_config_interp_macro}"; \
 	sed "s|^\($${define_pattern}\) \".*\"$$|\1 \"$(elf_interp)\"|" \
 		"src/gcc/config/$${gcc_config_file}~" \
-		>"src/gcc/config/$${gcc_config_file}"
+		>"src/gcc/config/$${gcc_config_file}"; \
+	printf '\nMULTIARCH_DIRNAME = %s\n' "$(target)" \
+		>>"src/gcc/config/$${gcc_config_fragment}"
 	if [ "x$(target)" = 'x$(OPK_HOST_ARCH)' ]; then \
 		$(MAKE) -f ../build "buildnative-$(target)"; \
 	else \
diff --git a/targets.d/core-linux-eglibc.sh b/targets.d/core-linux-eglibc.sh
index c5315a0..f93eddc 100644
--- a/targets.d/core-linux-eglibc.sh
+++ b/targets.d/core-linux-eglibc.sh
@@ -1,2 +1,3 @@
 gcc_config_file='i386/linux64.h'
 gcc_config_interp_macro='GLIBC_DYNAMIC_LINKER64'
+gcc_config_fragment='i386/t-linux64'
--
cgit v0.9.1