aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-01-14 11:56:32 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-01-15 09:22:03 +0000
commitfc2a01bcedaf85c2a4fd7675f80e877203cc57cb (patch)
tree5c950de2cad89adb6bebc2f0b7ea9c8793d9d8f8 /src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
parent85834ad350edb675d14daad71e878f74ce417353 (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/skyframe/ConfiguredTargetFunction.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index bd698d9cb8..70d72331e5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -645,7 +645,8 @@ final class ConfiguredTargetFunction implements SkyFunction {
for (Label configLabel : attributeMap.getConfigurabilityKeys(a.getName(), a.getType())) {
if (!BuildType.Selector.isReservedLabel(configLabel)) {
configLabelMap.put(a, LabelAndConfiguration.of(
- configLabel, ctgValue.getConfiguration()));
+ target.getLabel().resolveRepositoryRelative(configLabel),
+ ctgValue.getConfiguration()));
}
}
}