From 5a628a646663d760dd367253a34456d1f7e1b6a5 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 02 Jul 2013 13:44:11 -0400
Subject: Just use --with-gxx-include-dir.

---
diff --git a/build b/build
index e514a46..282db01 100755
--- a/build
+++ b/build
@@ -34,6 +34,7 @@ common_opts = \
 	--without-included-gettext \
 	--with-nls \
 	--with-sysroot="$${OPK_SYSROOT:-/}" \
+	--with-gxx-include-dir=/usr/include/c++-4.7 \
 	--enable-clocale=gnu
 
 full_opts = \
@@ -146,7 +147,6 @@ $(installnative_targets):
 	# See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>.
 	libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
 	oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install -- \
-		gxx_include_dir=/usr/include/c++-4.7 \
 		host_installdir=/usr/include/$(target)/c++-4.7/bits \
 		libsubdir="$${libsubdir}" \
 		libexecsubdir="$${libsubdir}" \
diff --git a/patches/01_allow-more-dirs-to-be-configured.patch b/patches/01_allow-more-dirs-to-be-configured.patch
index cca9d2b..cab2182 100644
--- a/patches/01_allow-more-dirs-to-be-configured.patch
+++ b/patches/01_allow-more-dirs-to-be-configured.patch
@@ -146,13 +146,12 @@ diff -Naur src.orig/libstdc++-v3/Makefile.in src/libstdc++-v3/Makefile.in
 diff -Naur src.orig/Makefile.def src/Makefile.def
 --- src.orig/Makefile.def	2013-04-20 14:46:22.918763972 -0400
 +++ src/Makefile.def	2013-04-21 10:37:16.013678375 -0400
-@@ -199,6 +199,14 @@
+@@ -199,6 +199,13 @@
  flags_to_pass = { flag= tooldir ; };
  flags_to_pass = { flag= build_tooldir ; };
  flags_to_pass = { flag= target_alias ; };
 +flags_to_pass = { flag= libsubdir ; };
 +flags_to_pass = { flag= libexecsubdir ; };
-+flags_to_pass = { flag= gxx_include_dir ; };
 +flags_to_pass = { flag= host_installdir ; };
 +flags_to_pass = { flag= libsubincludedir ; };
 +flags_to_pass = { flag= fincludedir ; };
@@ -164,13 +163,12 @@ diff -Naur src.orig/Makefile.def src/Makefile.def
 diff -Naur src.orig/Makefile.in src/Makefile.in
 --- src.orig/Makefile.in	2012-08-06 10:34:27.000000000 -0400
 +++ src/Makefile.in	2013-04-21 10:33:31.899390474 -0400
-@@ -721,6 +721,14 @@
+@@ -721,6 +721,13 @@
  	"tooldir=$(tooldir)" \
  	"build_tooldir=$(build_tooldir)" \
  	"target_alias=$(target_alias)" \
 +	"libsubdir=$(libsubdir)" \
 +	"libexecsubdir=$(libexecsubdir)" \
-+	"gxx_include_dir=$(gxx_include_dir)" \
 +	"host_installdir=$(host_installdir)" \
 +	"libsubincludedir=$(libsubincludedir)" \
 +	"fincludedir=$(fincludedir)" \
--
cgit v0.9.1