Skip to content

Permit C++ build variables to be Label-valued #30682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fmeum wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −0
Open

Permit C++ build variables to be Label-valued #30682

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainVariables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.InputMetadataProvider;
import com.google.devtools.build.lib.actions.PathMapper;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.collect.nestedset.Depset;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.concurrent.BlazeInterners;
Expand Down Expand Up @@ -828,6 +829,7 @@ private static VariableValue asVariableValue(Object o) {
case NoneType ignored -> null; // null has the same behavior as omitted field
case Boolean b -> BooleanValue.of(b);
case String s -> new StringValue(s);
case Label label -> new StringValue(label.expandToCommandLine());
case Artifact artifact -> new ArtifactValue(artifact);
case PathFragment pathFragment -> new PathFragmentValue(pathFragment);
case Iterable<?> iterable -> new Sequence(ImmutableList.copyOf(iterable));
Expand Down