diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec
index 6046e77..709fcb8 100644
--- a/cross-aarch64-gcc7.spec
+++ b/cross-aarch64-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec
index 612bdc3..8b0a619 100644
--- a/cross-arm-gcc7.spec
+++ b/cross-arm-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec
index aac05c0..5dfe245 100644
--- a/cross-avr-gcc7.spec
+++ b/cross-avr-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index 7806f3a..52d34c0 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec
index b5c7ad1..7339cc7 100644
--- a/cross-epiphany-gcc7-bootstrap.spec
+++ b/cross-epiphany-gcc7-bootstrap.spec
@@ -79,7 +79,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -180,6 +179,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -256,6 +256,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -581,11 +582,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec
index 786217a..288bbbe 100644
--- a/cross-epiphany-gcc7.spec
+++ b/cross-epiphany-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec
index f12d581..c5737ad 100644
--- a/cross-hppa-gcc7.spec
+++ b/cross-hppa-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec
index aa6abe5..0894bd6 100644
--- a/cross-i386-gcc7.spec
+++ b/cross-i386-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec
index a81c273..a85804f 100644
--- a/cross-m68k-gcc7.spec
+++ b/cross-m68k-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec
index 4fe744c..b787aa8 100644
--- a/cross-mips-gcc7.spec
+++ b/cross-mips-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec
index bd717fb..022d1e8 100644
--- a/cross-nvptx-gcc7.spec
+++ b/cross-nvptx-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec
index cb352b1..2027cf9 100644
--- a/cross-ppc64-gcc7.spec
+++ b/cross-ppc64-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec
index e557e08..c5b0e1e 100644
--- a/cross-ppc64le-gcc7.spec
+++ b/cross-ppc64le-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index 7806f3a..52d34c0 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec
index de0e31d..347e8ad 100644
--- a/cross-rx-gcc7-bootstrap.spec
+++ b/cross-rx-gcc7-bootstrap.spec
@@ -79,7 +79,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -180,6 +179,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -256,6 +256,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -581,11 +582,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec
index 10b92a9..ddc3cfb 100644
--- a/cross-rx-gcc7.spec
+++ b/cross-rx-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec
index 1619fb4..6a1fbd2 100644
--- a/cross-s390x-gcc7.spec
+++ b/cross-s390x-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec
index 51aa9a5..533f2e9 100644
--- a/cross-sparc-gcc7.spec
+++ b/cross-sparc-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec
index 55c05cd..5bb2be2 100644
--- a/cross-sparc64-gcc7.spec
+++ b/cross-sparc64-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index 7806f3a..52d34c0 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec
index 4a29c06..27ec23a 100644
--- a/cross-x86_64-gcc7.spec
+++ b/cross-x86_64-gcc7.spec
@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/cross.spec.in b/cross.spec.in
index 6c9fdbe..c03f33e 100644
--- a/cross.spec.in
+++ b/cross.spec.in
@@ -57,7 +57,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -160,11 +159,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
diff --git a/gcc.spec.in b/gcc.spec.in
index 336c568..2d408aa 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -304,6 +304,7 @@ Patch11:	gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:	gcc7-pr81481.diff
 Patch14:	gcc7-pr82248.diff
+Patch15:	gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:	gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -1059,6 +1060,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
diff --git a/gcc7-avoid-fixinc-error.diff b/gcc7-avoid-fixinc-error.diff
new file mode 100644
index 0000000..bf60366
--- /dev/null
+++ b/gcc7-avoid-fixinc-error.diff
@@ -0,0 +1,18 @@
+Index: gcc/Makefile.in
+===================================================================
+--- gcc/Makefile.in	(revision 255402)
++++ gcc/Makefile.in	(working copy)
+@@ -2993,13 +2993,6 @@ stmp-fixinc: gsyslimits.h macro_list fix
+ 	    sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \
+ 	    multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \
+ 	    fix_dir=include-fixed$${multi_dir}; \
+-	    if ! $(inhibit_libc) && test ! -d ${SYSTEM_HEADER_DIR}; then \
+-	      echo The directory that should contain system headers does not exist: >&2 ; \
+-	      echo "  ${SYSTEM_HEADER_DIR}" >&2 ; \
+-	      tooldir_sysinc=`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`; \
+-	      if test "x${SYSTEM_HEADER_DIR}" = "x$${tooldir_sysinc}"; \
+-	      then sleep 1; else exit 1; fi; \
+-	    fi; \
+ 	    $(mkinstalldirs) $${fix_dir}; \
+ 	    chmod a+rx $${fix_dir} || true; \
+ 	    (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index 7806f3a..52d34c0 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec
index cff3641..e86c94d 100644
--- a/gcc7-testresults.spec
+++ b/gcc7-testresults.spec
@@ -317,6 +317,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -445,6 +446,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
diff --git a/gcc7.changes b/gcc7.changes
index 7806f3a..52d34c0 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 
diff --git a/gcc7.spec b/gcc7.spec
index c69ee1d..5d35134 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -299,6 +299,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -1749,6 +1750,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61