[617118d] | 1 | Submitted by: Ryan Oliver <ryan.oliver@pha.com.au>
|
---|
| 2 | Date: 20050503
|
---|
| 3 | Initial Package Version: 4.0.0
|
---|
| 4 | Description:
|
---|
| 5 | Removes standard_exec_prefix_2 from library search path when cross-compiling.
|
---|
| 6 | Removes both standard_exec_prefix_1 and standard_exec_prefix_2 from the gcc
|
---|
| 7 | executable search path when cross-compiling.
|
---|
| 8 |
|
---|
| 9 | ie: if cross_compile = 1 in the specs file, do not
|
---|
| 10 | - add /usr/lib/gcc/${TARGET}/${GCC_VER} to the library search path
|
---|
| 11 | - add /usr/lib/gcc/${TARGET}/${GCC_VER} or
|
---|
| 12 | /usr/libexec/gcc/${TARGET}/${GCC_VER}
|
---|
| 13 | to the executable search path
|
---|
| 14 |
|
---|
| 15 |
|
---|
| 16 | --- gcc-4.0.0/gcc/gcc.c-orig 2005-04-16 11:38:45.000000000 +1000
|
---|
| 17 | +++ gcc-4.0.0/gcc/gcc.c 2005-05-03 22:18:10.000000000 +1000
|
---|
| 18 | @@ -3797,16 +3797,22 @@
|
---|
| 19 | PREFIX_PRIORITY_LAST, 2, 0);
|
---|
| 20 | add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
|
---|
| 21 | PREFIX_PRIORITY_LAST, 2, 0);
|
---|
| 22 | - add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
|
---|
| 23 | + if (*cross_compile == '0')
|
---|
| 24 | + {
|
---|
| 25 | + add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
|
---|
| 26 | PREFIX_PRIORITY_LAST, 2, 0);
|
---|
| 27 | - add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
|
---|
| 28 | + add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
|
---|
| 29 | PREFIX_PRIORITY_LAST, 2, 0);
|
---|
| 30 | + }
|
---|
| 31 | #endif
|
---|
| 32 |
|
---|
| 33 | add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
|
---|
| 34 | PREFIX_PRIORITY_LAST, 1, 0);
|
---|
| 35 | - add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
|
---|
| 36 | + if (*cross_compile == '0')
|
---|
| 37 | + {
|
---|
| 38 | + add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
|
---|
| 39 | PREFIX_PRIORITY_LAST, 1, 0);
|
---|
| 40 | + }
|
---|
| 41 |
|
---|
| 42 | tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
|
---|
| 43 | dir_separator_str, NULL);
|
---|