diff options
| author |  Lukacs Berki <lberki@google.com> | 2016-01-14 11:56:32 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-15 09:22:03 +0000 |
| commit | fc2a01bcedaf85c2a4fd7675f80e877203cc57cb (patch) | |
| tree | 5c950de2cad89adb6bebc2f0b7ea9c8793d9d8f8 /src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapper.java | |
| parent | 85834ad350edb675d14daad71e878f74ce417353 (diff) | |
Add a few other Label.resolveRepositoryRelative() calls to make select() statements work in remote repositories.
This work is somewhat sisyphean; the principled thing to do would be to just do this resolution when labels are parsed.
Fixes #783.
--
MOS_MIGRATED_REVID=112137996
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapper.java index 895f08e67e..65267f62d4 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapper.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAttributeMapper.java @@ -132,7 +132,8 @@ public class ConfiguredAttributeMapper extends AbstractAttributeMapper { continue; } - ConfigMatchingProvider curCondition = Verify.verifyNotNull(configConditions.get(selectorKey)); + ConfigMatchingProvider curCondition = Verify.verifyNotNull(configConditions.get( + rule.getLabel().resolveRepositoryRelative(selectorKey))); conditionLabels.add(curCondition.label()); if (curCondition.matches()) { |