From d3a726cdb6fbb0483c653264bcd05757f1f04824 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Wed, 29 Jul 2015 17:51:37 +0000 Subject: Fix middleman conflicts in external repositories by appending the package path Fixes #341. -- MOS_MIGRATED_REVID=99390495 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index 751be081f5..5250665375 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -458,8 +458,9 @@ public class CppHelper { artifacts = symlinkedArtifacts; purpose += "_with_solib"; } - return ImmutableList.of(factory.createMiddlemanAllowMultiple( - env, actionOwner, purpose, artifacts, configuration.getMiddlemanDirectory())); + return ImmutableList.of( + factory.createMiddlemanAllowMultiple(env, actionOwner, ruleContext.getPackageDirectory(), + purpose, artifacts, configuration.getMiddlemanDirectory())); } /** -- cgit v1.2.3