summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-04-26 07:00:32 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-04-26 07:00:32 (EDT)
commit8fa0fd1933ea75fa84c2da4c5a5537efaedae10d (patch)
treebd6c04517be1c8e88deefc7a0c05837637dd5783 /patches
parent568e7d13d4a7d7ab5f2a9db08fad880d3fdb1452 (diff)
Adjust patch to add additional GCC search dir.
Diffstat (limited to 'patches')
-rw-r--r--patches/01_pass-some-dirs-to-child-makes.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/01_pass-some-dirs-to-child-makes.patch b/patches/01_pass-some-dirs-to-child-makes.patch
index 8b81b5f..6b44792 100644
--- a/patches/01_pass-some-dirs-to-child-makes.patch
+++ b/patches/01_pass-some-dirs-to-child-makes.patch
@@ -4,6 +4,46 @@ Description: Pass some dir paths to child makes
want to change these values.
From: "P. J. McDermott" <pjm@nac.net>
+diff -Naur src.orig/gcc/gcc.c src/gcc/gcc.c
+--- src.orig/gcc/gcc.c 2013-03-08 02:25:09.000000000 -0500
++++ src/gcc/gcc.c 2013-04-25 21:16:04.893780032 -0400
+@@ -1130,6 +1130,8 @@
+ static const char *const standard_bindir_prefix = STANDARD_BINDIR_PREFIX;
+ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
+
++static const char *const user_tooldir_prefix = USER_TOOLDIR_PREFIX;
++
+ /* For native compilers, these are well-known paths containing
+ components that may be provided by the system. For cross
+ compilers, these paths are not used. */
+@@ -3688,6 +3690,16 @@
+ PREFIX_PRIORITY_LAST, 0, 0);
+ }
+
++ add_prefix (&exec_prefixes,
++ concat (user_tooldir_prefix, dir_separator_str, NULL),
++ 0, PREFIX_PRIORITY_LAST, 0, 0);
++ add_prefix (&startfile_prefixes,
++ concat (user_tooldir_prefix, dir_separator_str, NULL),
++ 0, PREFIX_PRIORITY_LAST, 0, 0);
++ add_prefix (&include_prefixes,
++ concat (user_tooldir_prefix, dir_separator_str, NULL),
++ 0, PREFIX_PRIORITY_LAST, 0, 0);
++
+ /* COMPILER_PATH and LIBRARY_PATH have values
+ that are lists of directory names with colons. */
+
+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 @@
+ -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
+ -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
+ -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \
++ -DUSER_TOOLDIR_PREFIX=\"$(libexecsubdir)\" \
+ @TARGET_SYSTEM_ROOT_DEFINE@ \
+ $(VALGRIND_DRIVER_DEFINES) \
+ `test "X$${SHLIB}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \
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