/[gentoo-x86]/sys-devel/gcc-apple/files/gcc-apple-4.2.1-prefix-search-dirs-r1.patch
Gentoo

Contents of /sys-devel/gcc-apple/files/gcc-apple-4.2.1-prefix-search-dirs-r1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Nov 22 02:47:29 2014 UTC (2 years, 10 months ago) by redlizard
Branch: MAIN
CVS Tags: HEAD
Change gcclibs behavior to the standard prefix model.

(Portage version: 2.2.14-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x10FB016B)

1 In Prefix we are really self-providing, so don't look back!
2 Original patch by Heiko Przybyl
3
4 /usr/lib and /lib are not valid locations to search for startfiles,
5 especially as they come BEFORE the prefix locations.
6
7 --- gcc/gcc.c
8 +++ gcc/gcc.c
9 @@ -1525,8 +1525,8 @@ static const char *gcc_libexec_prefix;
10 #endif
11
12 static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
13 -static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
14 -static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
15 +static const char *const standard_exec_prefix_1 = "@GENTOO_PORTAGE_EPREFIX@/usr/libexec/gcc/";
16 +static const char *const standard_exec_prefix_2 = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/";
17 static const char *md_exec_prefix = MD_EXEC_PREFIX;
18
19 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
20 diff --git a/a/gcc/config/darwin.h b/b/gcc/config/darwin.h
21 index 482cd4c..b971c64 100644
22 --- gcc/config/darwin.h
23 +++ gcc/config/darwin.h
24 @@ -24,6 +24,15 @@ Boston, MA 02110-1301, USA. */
25 #ifndef CONFIG_DARWIN_H
26 #define CONFIG_DARWIN_H
27
28 +#undef STANDARD_STARTFILE_PREFIX
29 +#define STANDARD_STARTFILE_PREFIX "@GENTOO_PORTAGE_TPREFIX@/usr/lib"
30 +
31 +#undef STANDARD_STARTFILE_PREFIX_1
32 +#define STANDARD_STARTFILE_PREFIX_1 "@GENTOO_PORTAGE_TPREFIX@/lib"
33 +
34 +#undef STANDARD_STARTFILE_PREFIX_2
35 +#define STANDARD_STARTFILE_PREFIX_2 STANDARD_STARTFILE_PREFIX_1
36 +
37 /* The definitions in this file are common to all processor types
38 running Darwin, which is the kernel for Mac OS X. Darwin is
39 basically a BSD user layer laid over a Mach kernel, then evolved

  ViewVC Help
Powered by ViewVC 1.1.20