pyrox.dev
1diff -ru3 gcc-3.3.6-old/gcc/cppdefault.c gcc-3.3.6/gcc/cppdefault.c
2--- gcc-3.3.6-old/gcc/cppdefault.c 2003-11-07 02:13:31.000000000 +0300
3+++ gcc-3.3.6/gcc/cppdefault.c 2016-09-02 16:00:03.492484016 +0300
4@@ -26,6 +26,10 @@
5 #include "system.h"
6 #include "cppdefault.h"
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 -ru3 gcc-3.3.6-old/gcc/gcc.c gcc-3.3.6/gcc/gcc.c
16--- gcc-3.3.6-old/gcc/gcc.c 2004-04-01 20:55:17.000000000 +0400
17+++ gcc-3.3.6/gcc/gcc.c 2016-09-02 16:01:24.843520114 +0300
18@@ -6130,10 +6130,6 @@
19 NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
20 }
21
22- add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1,
23- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
24- add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2,
25- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
26 #if 0 /* Can cause surprises, and one can use -B./ instead. */
27 add_prefix (&startfile_prefixes, "./", NULL,
28 PREFIX_PRIORITY_LAST, 1, NULL, 0);
29diff -ru3 gcc-3.3.6-old/gcc/Makefile.in gcc-3.3.6/gcc/Makefile.in
30--- gcc-3.3.6-old/gcc/Makefile.in 2004-04-01 20:55:23.000000000 +0400
31+++ gcc-3.3.6/gcc/Makefile.in 2016-09-02 16:00:03.493484017 +0300
32@@ -260,7 +260,11 @@
33 PARTITION_H = $(srcdir)/../include/partition.h
34
35 # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
36-NATIVE_SYSTEM_HEADER_DIR = /usr/include
37+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
38+# `fixinc' from fixing header files in /usr/include. However,
39+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
40+# it to some dummy directory.
41+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
42 # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
43 CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
44
45@@ -2201,7 +2205,7 @@
46 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
47 -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \
48 -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
49- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
50+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
51 -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
52 -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
53 @TARGET_SYSTEM_ROOT_DEFINE@