Do not create symlink pointing at itself with strip_include_prefix/include_prefix

This cl fixes a bug when strip_include_prefix and include_prefix are used in
such a way that the resulting virtual header is be accessible from the same
path as the original header and bazel would attempt to create symlink pointing
at itself.

Fixes #2635

--
PiperOrigin-RevId: 149524480
MOS_MIGRATED_REVID=149524480

1 files changed, 14 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
index f29682238e..4151d995c7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
@@ -1242,12 +1242,20 @@ public final class CcLibraryHelper {
         includePath = prefix.getRelative(includePath);
       }
 
-      Artifact virtualHeader = ruleContext.getUniqueDirectoryArtifact("_virtual_includes",
-          includePath, ruleContext.getBinOrGenfilesDirectory());
-      ruleContext.registerAction(new SymlinkAction(
-          ruleContext.getActionOwner(), originalHeader, virtualHeader,
-          "Symlinking virtual headers for " + ruleContext.getLabel()));
-      moduleHeadersBuilder.add(virtualHeader);
+      if (!originalHeader.getExecPath().equals(includePath)) {
+        Artifact virtualHeader =
+            ruleContext.getUniqueDirectoryArtifact(
+                "_virtual_includes", includePath, ruleContext.getBinOrGenfilesDirectory());
+        ruleContext.registerAction(
+            new SymlinkAction(
+                ruleContext.getActionOwner(),
+                originalHeader,
+                virtualHeader,
+                "Symlinking virtual headers for " + ruleContext.getLabel()));
+        moduleHeadersBuilder.add(virtualHeader);
+      } else {
+        moduleHeadersBuilder.add(originalHeader);
+      }
     }
 
     ImmutableList<Artifact> moduleMapHeaders = moduleHeadersBuilder.build();