Add -fno-canonical-system-headers to CROSSTOOL files so that gcc doesn't resolve symlinks in .d files, which would confuse Blaze.
Fixes #714.
--
MOS_MIGRATED_REVID=111583801
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java
index 49391d4..43f61c9 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java
@@ -101,6 +101,7 @@
.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 @@
.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 @@
.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 @@
.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/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java
index e133ec3..d365bda 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java
@@ -157,6 +157,7 @@
.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 @@
.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/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java
index 96807f3..fc83283 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java
@@ -142,6 +142,7 @@
.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 @@
.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
index 1a046cc..b3f1ae0 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -110,6 +110,7 @@
# 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 @@
# 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 @@
# 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.
