diff options
| author |  Lukacs Berki <lberki@google.com> | 2016-01-07 09:29:08 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-01-07 13:47:03 +0000 |
| commit | 763f1397155fc7c12e1f1071a1bc942f91b867c4 (patch) | |
| tree | ce4505d7b03c1f1ddf28fe712cd6f29bcadad942 /src | |
| parent | 727d51a6b1aefb4227d7af4f4ab542f613a23803 (diff) | |
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
Diffstat (limited to 'src')
3 files changed, 8 insertions, 0 deletions
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 49391d4af9..43f61c9659 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 @@ class ArmCrosstools { .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 @@ class ArmCrosstools { .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 @@ class ArmCrosstools { .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 @@ class ArmCrosstools { .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 e133ec3333..d365bda53e 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 @@ class MipsCrosstools { .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 @@ class MipsCrosstools { .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 96807f3264..fc832835b0 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 @@ class X86Crosstools { .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 @@ class X86Crosstools { .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") |