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--- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200
32+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200
33@@ -378,7 +378,11 @@
34 MD5_H = $(srcdir)/../include/md5.h
35
36 # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
37-NATIVE_SYSTEM_HEADER_DIR = /usr/include
38+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
39+# `fixinc' from fixing header files in /usr/include. However,
40+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
41+# it to some dummy directory.
42+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
43 # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
44 CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
45
46@@ -3277,7 +3281,7 @@
47 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
48 -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
49 -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
50- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
51+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
52 -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
53 -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
54 -DPREFIX=\"$(prefix)/\" \