Skip to content
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

Jump to bottom

Add additional_compiler_inputs support to local_defines/defines #23102

Closed
wants to merge 3 commits into from
Closed

Add additional_compiler_inputs support to local_defines/defines #23102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4940734
Add additional_compiler_inputs support to local_defines/defines
keith Jul 24, 2024
0a777e4
local_defines only
keith Jul 25, 2024
84dbcae
no mutation
keith Jul 25, 2024
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
8 changes: 4 additions & 4 deletions src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,11 +1118,11 @@ def _linkopts(ctx, additional_make_variable_substitutions, cc_toolchain):
fail("in linkopts attribute of cc_library rule {}: Apple builds do not support statically linked binaries".format(ctx.label))
return tokens

def _defines_attribute(ctx, additional_make_variable_substitutions, attr_name):
def _defines_attribute(ctx, additional_make_variable_substitutions, attr_name, additional_targets):
defines = getattr(ctx.attr, attr_name, [])
if len(defines) == 0:
return []
targets = []
targets = list(additional_targets)
for dep in ctx.attr.deps:
targets.append(dep)
result = []
Expand All @@ -1140,10 +1140,10 @@ def _defines_attribute(ctx, additional_make_variable_substitutions, attr_name):
return result

def _defines(ctx, additional_make_variable_substitutions):
return _defines_attribute(ctx, additional_make_variable_substitutions, "defines")
return _defines_attribute(ctx, additional_make_variable_substitutions, "defines", [])

def _local_defines(ctx, additional_make_variable_substitutions):
return _defines_attribute(ctx, additional_make_variable_substitutions, "local_defines")
return _defines_attribute(ctx, additional_make_variable_substitutions, "local_defines", getattr(ctx.attr, "additional_compiler_inputs", []))

def _linker_scripts(ctx):
result = []
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,4 +2502,26 @@ public void testAdditionalCompilerInputsArePassedToCompile() throws Exception {
assertThat(action.getInputs().toList()).contains(getSourceArtifact("foo/compiler_input.txt"));
assertThat(action.getArguments()).contains("foo/compiler_input.txt");
}

@Test
public void testAdditionalCompilerInputsArePassedToCompileFromLocalDefines() throws Exception {
AnalysisMock.get().ccSupport().setupCcToolchainConfig(mockToolsConfig);
scratch.file(
"foo/BUILD",
"""
cc_library(
name = 'foo',
srcs = ['hello.cc'],
local_defines = ['FOO=$(location compiler_input.txt)'],
additional_compiler_inputs = ['compiler_input.txt'],
)
""");
scratch.file("foo/compiler_input.txt", "hello world!");

ConfiguredTarget lib = getConfiguredTarget("//foo:foo");
Artifact artifact = getBinArtifact("_objs/foo/hello.o", lib);
CppCompileAction action = (CppCompileAction) getGeneratingAction(artifact);
assertThat(action.getInputs().toList()).contains(getSourceArtifact("foo/compiler_input.txt"));
assertThat(action.getArguments()).contains("-DFOO=foo/compiler_input.txt");
}
}
Loading