diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-07-02 13:45:49 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-07-02 13:45:49 (EDT) |
| commit | d0f8b6478e0f9684e4d5325e0fd74e4aa31c7296 (patch) | |
| tree | 5da772e818ba0386e04eb565635cf12f19d05d13 | |
| parent | 5a628a646663d760dd367253a34456d1f7e1b6a5 (diff) | |
Make and use a new macro in gcc/Makefile.
| -rwxr-xr-x | build | 2 | ||||
| -rw-r--r-- | patches/01_allow-more-dirs-to-be-configured.patch | 25 |
2 files changed, 24 insertions, 3 deletions
@@ -111,6 +111,7 @@ $(buildnative_targets): oh-autobuild -B "$(builddir)" -T bootstrap-lean -- -j $${JOBS:-1} \ libsubdir="$${libsubdir}" \ libexecsubdir="$${libsubdir}" \ + gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-4.7/bits" \ libsubincludedir="$${libsubdir}/include" \ fincludedir="$${libsubdir}/finclude" \ toolexeclibdir="/usr/lib/$(target)" \ @@ -121,6 +122,7 @@ $(buildcross_targets): oh-autobuild -B "$(builddir)" -T all-gcc -- -j $${JOBS:-1} \ libsubdir="$${libsubdir}" \ libexecsubdir="$${libsubdir}" \ + gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-4.7/bits" \ libsubincludedir="$${libsubdir}/include" \ fincludedir="$${libsubdir}/finclude" \ toolexeclibdir="/usr/lib/$(target)" \ diff --git a/patches/01_allow-more-dirs-to-be-configured.patch b/patches/01_allow-more-dirs-to-be-configured.patch index cab2182..b49fcb5 100644 --- a/patches/01_allow-more-dirs-to-be-configured.patch +++ b/patches/01_allow-more-dirs-to-be-configured.patch @@ -39,7 +39,15 @@ diff -Naur src.orig/gcc/gcc.c src/gcc/gcc.c diff -Naur src.orig/gcc/Makefile.in src/gcc/Makefile.in --- src.orig/gcc/Makefile.in 2013-04-01 04:11:11.000000000 -0400 +++ src/gcc/Makefile.in 2013-04-25 17:58:17.104382447 -0400 -@@ -2097,6 +2097,7 @@ +@@ -630,6 +630,7 @@ + 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 +@@ -2097,6 +2098,7 @@ -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \ -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \ @@ -47,6 +55,15 @@ diff -Naur src.orig/gcc/Makefile.in src/gcc/Makefile.in @TARGET_SYSTEM_ROOT_DEFINE@ \ $(VALGRIND_DRIVER_DEFINES) \ `test "X$${SHLIB}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \ +@@ -3999,7 +4000,7 @@ + -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 -Naur src.orig/libmudflap/Makefile.am src/libmudflap/Makefile.am --- src.orig/libmudflap/Makefile.am 2009-08-22 09:41:50.000000000 -0400 +++ src/libmudflap/Makefile.am 2013-04-20 15:19:34.500991568 -0400 @@ -146,12 +163,13 @@ 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,13 @@ +@@ -199,6 +199,14 @@ 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= gcc_gxx_tool_include_dir ; }; +flags_to_pass = { flag= host_installdir ; }; +flags_to_pass = { flag= libsubincludedir ; }; +flags_to_pass = { flag= fincludedir ; }; @@ -163,12 +181,13 @@ 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,13 @@ +@@ -721,6 +721,14 @@ "tooldir=$(tooldir)" \ "build_tooldir=$(build_tooldir)" \ "target_alias=$(target_alias)" \ + "libsubdir=$(libsubdir)" \ + "libexecsubdir=$(libexecsubdir)" \ ++ "gcc_gxx_tool_include_dir=$(gcc_gxx_tool_include_dir)" \ + "host_installdir=$(host_installdir)" \ + "libsubincludedir=$(libsubincludedir)" \ + "fincludedir=$(fincludedir)" \ |