← Back to branch summary

~ubuntu-branches/debian/sid/gcc-4.8/sid

« back to all changes in this revision

Viewing changes to .svn/pristine/4e/4e90d1d934b79463d681981d90e9f6e0b94025c8.svn-base

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-12-19 19:48:34 UTC
  • Revision ID: package-import@ubuntu.com-20141219194834-4dz1q7rrn5pad823
Tags: 4.8.4-1
* GCC 4.8.4 release.
  - Fix PR target/61407 (darwin), PR middle-end/58624 (ice),
    PR sanitizer/64265 (wrong code).
* Require recent binutils to pass go test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.svn/pristine/4e/4e90d1d934b79463d681981d90e9f6e0b94025c8.svn-base
 
1
# DP: Don't add /usr/local/include for cross compilers. Assume that
 
2
# DP: /usr/include is ready for multiarch, but not /usr/local/include.
 
3
 
 
4
--- a/src/gcc/cppdefault.c
 
5
+++ b/src/gcc/cppdefault.c
 
6
@@ -66,8 +66,11 @@
 
7
 #ifdef LOCAL_INCLUDE_DIR
 
8
     /* /usr/local/include comes before the fixincluded header files.  */
 
9
     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
 
10
+#if 0
 
11
+    /* Unsafe to assume that /usr/local/include is ready for multiarch.  */
 
12
     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
 
13
 #endif
 
14
+#endif
 
15
 #ifdef PREFIX_INCLUDE_DIR
 
16
     { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0 },
 
17
 #endif