Mercurial > hg > aboriginal

comparison sources/patches/gcc-core-stopdefaults2.patch @ 1666:ba28c96cba42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patch from Bobby Bingham to remove some more hardwired path stupidity gcc reaches around ccwrap to perpetrate.
author Rob Landley <rob@landley.net>
date Wed, 02 Jul 2014 21:16:34 -0500
parents
children
comparison
equal deleted inserted replaced
1665:98311ea2e4c2 1666:ba28c96cba42
1 Fix from Bobby Bingham.
2
3 diff -ru gcc-core/gcc/gcc.c gcc-core2/gcc/gcc.c
4 --- gcc-core/gcc/gcc.c 2014-01-05 20:23:51.963533293 -0600
5 +++ gcc-core2/gcc/gcc.c 2014-01-05 20:28:03.776864811 -0600
6 @@ -1473,8 +1473,6 @@
7 #endif
8
9 static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
10 -static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
11 -static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
12 static const char *md_exec_prefix = MD_EXEC_PREFIX;
13
14 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
15 @@ -3949,16 +3947,10 @@
16 PREFIX_PRIORITY_LAST, 2, 0);
17 add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
18 PREFIX_PRIORITY_LAST, 2, 0);
19 - add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
20 - PREFIX_PRIORITY_LAST, 2, 0);
21 - add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
22 - PREFIX_PRIORITY_LAST, 2, 0);
23 #endif
24
25 add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
26 PREFIX_PRIORITY_LAST, 1, 0);
27 - add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
28 - PREFIX_PRIORITY_LAST, 1, 0);
29
30 tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
31 dir_separator_str, NULL);