pyrox.dev
1diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c
2--- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200
3+++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200
4@@ -41,6 +41,10 @@
5 # undef CROSS_INCLUDE_DIR
6 #endif
7
8+#undef LOCAL_INCLUDE_DIR
9+#undef SYSTEM_INCLUDE_DIR
10+#undef STANDARD_INCLUDE_DIR
11+
12 const struct default_include cpp_include_defaults[]
13 #ifdef INCLUDE_DEFAULTS
14 = INCLUDE_DEFAULTS;
15diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c
16--- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100
17+++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200
18@@ -1478,10 +1478,10 @@
19 /* Default prefixes to attach to command names. */
20
21 #ifndef STANDARD_STARTFILE_PREFIX_1
22-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
23+#define STANDARD_STARTFILE_PREFIX_1 ""
24 #endif
25 #ifndef STANDARD_STARTFILE_PREFIX_2
26-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
27+#define STANDARD_STARTFILE_PREFIX_2 ""
28 #endif
29
30 #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */
31@@ -1515,8 +1515,8 @@
32 /* For native compilers, these are well-known paths containing
33 components that may be provided by the system. For cross
34 compilers, these paths are not used. */
35-static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
36-static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
37+static const char *const standard_exec_prefix_1 = "/no-such-path/";
38+static const char *const standard_exec_prefix_2 = "/no-such-path/";
39 static const char *md_exec_prefix = MD_EXEC_PREFIX;
40 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
41 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
42diff -ru gcc-4.3.1-orig/gcc/Makefile.in gcc-4.3.1/gcc/Makefile.in
43--- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200
44+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200
45@@ -378,7 +378,11 @@
46 MD5_H = $(srcdir)/../include/md5.h
47
48 # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
49-NATIVE_SYSTEM_HEADER_DIR = /usr/include
50+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
51+# `fixinc' from fixing header files in /usr/include. However,
52+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
53+# it to some dummy directory.
54+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
55 # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
56 CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
57
58@@ -3277,7 +3281,7 @@
59 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
60 -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
61 -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
62- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
63+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
64 -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
65 -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
66 -DPREFIX=\"$(prefix)/\" \