Add -fno-canonical-system-headers to CROSSTOOL files so that gcc does…

…n't resolve symlinks in .d files, which would confuse Blaze. Fixes #714. -- MOS_MIGRATED_REVID=111583801
bazelbuild · Jan 7, 2016 · 763f139 · 763f139
1 parent 727d51a
commit 763f139
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/...n/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java b/...n/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java
@@ -101,6 +101,7 @@ private CToolchain.Builder createAarch64Toolchain() {
         .addCompilerFlag("-funwind-tables")
         .addCompilerFlag("-fstack-protector-strong")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
 
         // Linker flags
         .addLinkerFlag("-no-canonical-prefixes")
@@ -158,6 +159,7 @@ private CToolchain.Builder createAarch64ClangToolchain(String clangVersion) {
         .addCompilerFlag("-Wno-invalid-command-line-argument")
         .addCompilerFlag("-Wno-unused-command-line-argument")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
 
         // Linker flags
         .addLinkerFlag("-gcc-toolchain")
@@ -259,6 +261,7 @@ private CToolchain.Builder createBaseArmeabiToolchain(
         .addCompilerFlag("-ffunction-sections")
         .addCompilerFlag("-funwind-tables")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
 
         // Linker flags
         .addLinkerFlag("-no-canonical-prefixes");
@@ -394,6 +397,7 @@ private CToolchain.Builder createBaseArmeabiClangToolchain(String clangVersion,
         .addCompilerFlag("-Wno-invalid-command-line-argument")
         .addCompilerFlag("-Wno-unused-command-line-argument")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
         .addCompilerFlag("-fno-integrated-as")
 
         // Linker flags

diff --git a/.../java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java b/.../java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java
@@ -157,6 +157,7 @@ private CToolchain.Builder createBaseMipsToolchain() {
         .addCompilerFlag("-frerun-cse-after-loop")
         .addCompilerFlag("-frename-registers")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
 
         // Linker flags
         .addLinkerFlag("-no-canonical-prefixes")
@@ -204,6 +205,7 @@ private CToolchain.Builder createBaseMipsClangToolchain(
         .addCompilerFlag("-Wno-invalid-command-line-argument")
         .addCompilerFlag("-Wno-unused-command-line-argument")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
 
         // Linker flags
         .addLinkerFlag("-gcc-toolchain")

diff --git a/...n/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java b/...n/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java
@@ -142,6 +142,7 @@ private CToolchain.Builder createBaseX86Toolchain() {
         .addCompilerFlag("-ffunction-sections")
         .addCompilerFlag("-funwind-tables")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
 
         // Linker flags
         .addLinkerFlag("-no-canonical-prefixes")
@@ -191,6 +192,7 @@ private CToolchain.Builder createBaseX86ClangToolchain(
         .addCompilerFlag("-Wno-invalid-command-line-argument")
         .addCompilerFlag("-Wno-unused-command-line-argument")
         .addCompilerFlag("-no-canonical-prefixes")
+        .addCompilerFlag("-fno-canonical-system-headers")
 
         // Linker flags
         .addLinkerFlag("-gcc-toolchain")

diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
@@ -110,6 +110,7 @@ toolchain {
 
   # Anticipated future default.
   unfiltered_cxx_flag: "-no-canonical-prefixes"
+  unfiltered_cxx_flag: "-fno-canonical-system-headers"
 
   # Make C++ compilation deterministic. Use linkstamping instead of these
   # compiler symbols.
@@ -220,6 +221,7 @@ toolchain {
 
   # Anticipated future default.
   unfiltered_cxx_flag: "-no-canonical-prefixes"
+
   # Make C++ compilation deterministic. Use linkstamping instead of these
   # compiler symbols.
   unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
@@ -323,6 +325,7 @@ toolchain {
 
   # Anticipated future default.
   unfiltered_cxx_flag: "-no-canonical-prefixes"
+  unfiltered_cxx_flag: "-fno-canonical-system-headers"
 
   # Make C++ compilation deterministic. Use linkstamping instead of these
   # compiler symbols.