From 3a5436c36f48b8780627a557d0647540b61f0a3a Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 13 May 2019 22:57:53 -0400
Subject: patches/01_allow-more-dirs-to-be-configured.patch: Restore gcc_gxx_tool_include_dir

---
(limited to 'patches')

diff --git a/patches/01_allow-more-dirs-to-be-configured.patch b/patches/01_allow-more-dirs-to-be-configured.patch
index 2f417ea..3605e54 100644
--- a/patches/01_allow-more-dirs-to-be-configured.patch
+++ b/patches/01_allow-more-dirs-to-be-configured.patch
@@ -33,7 +33,15 @@ diff -Naurp src.orig/gcc/gcc.c src/gcc/gcc.c
 diff -Naurp src.orig/gcc/Makefile.in src/gcc/Makefile.in
 --- src.orig/gcc/Makefile.in	2018-03-09 10:24:44.000000000 -0500
 +++ src/gcc/Makefile.in	2019-05-02 19:05:56.069075629 -0400
-@@ -2186,6 +2186,7 @@ DRIVER_DEFINES = \
+@@ -666,6 +666,7 @@ gcc_tooldir = @gcc_tooldir@
+ build_tooldir = $(exec_prefix)/$(target_noncanonical)
+ # Directory in which the compiler finds target-independent g++ includes.
+ gcc_gxx_include_dir = @gcc_gxx_include_dir@
++gcc_gxx_tool_include_dir = $(gcc_gxx_include_dir)/$(target_noncanonical)
+ gcc_gxx_include_dir_add_sysroot = @gcc_gxx_include_dir_add_sysroot@
+ # Directory to search for site-specific includes.
+ local_includedir = $(local_prefix)/include
+@@ -2186,6 +2187,7 @@ DRIVER_DEFINES = \
    -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
    -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
    -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \
@@ -41,25 +49,36 @@ diff -Naurp src.orig/gcc/Makefile.in src/gcc/Makefile.in
    -DACCEL_DIR_SUFFIX=\"$(accel_dir_suffix)\" \
    @TARGET_SYSTEM_ROOT_DEFINE@ \
    $(VALGRIND_DRIVER_DEFINES) \
+@@ -2873,7 +2875,7 @@ PREPROCESSOR_DEFINES = \
+   -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
+   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+   -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
+-  -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
++  -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_tool_include_dir)\" \
+   -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
+   -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
+   -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
 diff -Naurp src.orig/Makefile.def src/Makefile.def
 --- src.orig/Makefile.def	2017-11-28 05:35:37.000000000 -0500
 +++ src/Makefile.def	2019-05-02 19:23:36.588174507 -0400
-@@ -229,6 +229,7 @@ flags_to_pass = { flag= sysconfdir ; };
+@@ -229,6 +229,8 @@ flags_to_pass = { flag= sysconfdir ; };
  flags_to_pass = { flag= tooldir ; };
  flags_to_pass = { flag= build_tooldir ; };
  flags_to_pass = { flag= target_alias ; };
 +flags_to_pass = { flag= user_tooldir_prefix ; };
++flags_to_pass = { flag= gcc_gxx_tool_include_dir ; };
  
  // Build tools
  flags_to_pass = { flag= AWK ; };
 diff -Naurp src.orig/Makefile.in src/Makefile.in
 --- src.orig/Makefile.in	2017-11-28 05:35:37.000000000 -0500
 +++ src/Makefile.in	2019-05-02 19:24:29.804137725 -0400
-@@ -737,6 +737,7 @@ BASE_FLAGS_TO_PASS = \
+@@ -737,6 +737,8 @@ BASE_FLAGS_TO_PASS = \
  	"tooldir=$(tooldir)" \
  	"build_tooldir=$(build_tooldir)" \
  	"target_alias=$(target_alias)" \
 +	"user_tooldir_prefix=$(user_tooldir_prefix)" \
++	"gcc_gxx_tool_include_dir=$(gcc_gxx_tool_include_dir)" \
  	"AWK=$(AWK)" \
  	"BISON=$(BISON)" \
  	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
--
cgit v0.9.1