diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-07-29 17:51:37 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-07-30 11:31:14 +0000 |
| commit | d3a726cdb6fbb0483c653264bcd05757f1f04824 (patch) | |
| tree | ac8d7e7497b5909a5cff523e6291ad7efa70a825 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | |
| parent | 8ff5b3c00216392cd13dba61093c20501b377329 (diff) | |
Fix middleman conflicts in external repositories by appending the package path
Fixes #341.
--
MOS_MIGRATED_REVID=99390495
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 5 |
1 files changed, 3 insertions, 2 deletions
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())); } /** |