~angelsl/ubuntu/wily/gcc-5/mips-cross

« back to all changes in this revision

Viewing changes to debian/patches/canonical-cpppath.diff

  • Committer: angelsl
  • Date: 2015-10-30 03:30:35 UTC
  • Revision ID: angelsl-20151030033035-rmug41zm8hyjgisg
Original import

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# DP: Don't use any relative path names for the standard include paths.
 
2
 
 
3
Index: b/src/gcc/incpath.c
 
4
===================================================================
 
5
--- a/src/gcc/incpath.c
 
6
+++ b/src/gcc/incpath.c
 
7
@@ -173,6 +173,14 @@ add_standard_paths (const char *sysroot,
 
8
                        str = reconcat (str, str, dir_separator_str,
 
9
                                        imultiarch, NULL);
 
10
                    }
 
11
+                 {
 
12
+                   char *rp = lrealpath (str);
 
13
+                   if (rp)
 
14
+                     {
 
15
+                       free (str);
 
16
+                       str = rp;
 
17
+                     }
 
18
+                 }
 
19
                  add_path (str, SYSTEM, p->cxx_aware, false);
 
20
                }
 
21
            }
 
22
@@ -247,6 +255,14 @@ add_standard_paths (const char *sysroot,
 
23
              else
 
24
                str = reconcat (str, str, dir_separator_str, imultiarch, NULL);
 
25
            }
 
26
+         {
 
27
+           char *rp = lrealpath (str);
 
28
+           if (rp)
 
29
+             {
 
30
+               free (str);
 
31
+               str = rp;
 
32
+             }
 
33
+         }
 
34
 
 
35
          add_path (str, SYSTEM, p->cxx_aware, false);
 
36
        }